diff --git a/ChangeLog b/ChangeLog
index fcbad05..f51bb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,43 @@
 	* doc/en/Dia/ZOrderArgs.xml: Ditto
 	* doc/en/Dia/ZOrderHandler.xml: Ditto
 	* doc/en/Dia/*.xml: Ran through scan-deprecations.exe
+	* doc/en/Dia/Canvas.xml: Updated to reflect change in the code
+	* doc/en/Dia/CanvasBox.xml: Ditto
+	* doc/en/Dia/CanvasElement.xml: Ditto
+	* doc/en/Dia/CanvasGroup.xml: Ditto
+	* doc/en/Dia/CanvasGroupable.xml: Ditto	
+	* doc/en/Dia/CanvasImage.xml: Ditto
+	* doc/en/Dia/CanvasItem.xml: Ditto
+	* doc/en/Dia/CanvasIter.xml: Ditto
+	* doc/en/Dia/CanvasLine.xml: Ditto
+	* doc/en/Dia/CanvasText.xml: Ditto
+	* doc/en/Dia/CanvasView.xml: Ditto
+	* doc/en/Dia/CanvasViewItem.xml: Ditto
+	* doc/en/Dia/Constraint.xml: Ditto
+	* doc/en/Dia/ConstraintFunc.xml: Ditto
+	* doc/en/Dia/EventButton.xml: Ditto
+	* doc/en/Dia/EventFocus.xml: Ditto
+	* doc/en/Dia/EventKey.xml: Ditto
+	* doc/en/Dia/EventMotion.xml: Ditto
+	* doc/en/Dia/ExportSVG.xml: Ditto
+	* doc/en/Dia/Global.xml: Ditto	
+	* doc/en/Dia/Handle.xml: Ditto
+	* doc/en/Dia/HandleLayer.xml: Ditto
+	* doc/en/Dia/Point.xml: Ditto
+	* doc/en/Dia/Rectangle.xml: Ditto
+	* doc/en/Dia/SPoint.xml: Ditto
+	* doc/en/Dia/Selector.xml: Ditto
+	* doc/en/Dia/Shape.xml: Ditto
+	* doc/en/Dia/ShapeBezier.xml: Ditto
+	* doc/en/Dia/ShapeClip.xml: Ditto
+	* doc/en/Dia/ShapeEllipse.xml: Ditto
+	* doc/en/Dia/ShapeImage.xml: Ditto
+	* doc/en/Dia/ShapePath.xml: Ditto
+	* doc/en/Dia/ShapeText.xml: Ditto
+	* doc/en/Dia/Solver.xml: Ditto
+	* doc/en/Dia/StackTool.xml: Ditto
+	* doc/en/Dia/Tool.xml: Ditto
+	* doc/en/Dia/Variable.xml: Ditto
 
 2004-02-15  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
diff --git a/doc/en/Dia/Canvas.xml b/doc/en/Dia/Canvas.xml
index 9e980e3..ec0cb3e 100644
--- a/doc/en/Dia/Canvas.xml
+++ b/doc/en/Dia/Canvas.xml
@@ -374,14 +374,14 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Canvas" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -661,17 +661,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Canvas (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Canvas (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Canvas" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Canvas" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -689,10 +689,10 @@
       </Docs>
     </Member>
     <Member MemberName="ExtentsChanged">
-      <MemberSignature Language="C#" Value="public event DiaSharp.ExtentsChangedHandler ExtentsChanged;" />
+      <MemberSignature Language="C#" Value="public event Dia.ExtentsChangedHandler ExtentsChanged;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.ExtentsChangedHandler</ReturnType>
+        <ReturnType>Dia.ExtentsChangedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -738,5 +738,89 @@
 	</remarks>
       </Docs>
     </Member>
+    <Member MemberName="OverrideRedrawView">
+      <MemberSignature Language="C#" Value="protected static void OverrideRedrawView (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideUndo">
+      <MemberSignature Language="C#" Value="protected static void OverrideUndo (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideExtentsChanged">
+      <MemberSignature Language="C#" Value="protected static void OverrideExtentsChanged (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnRedrawView">
+      <MemberSignature Language="C#" Value="protected virtual void OnRedrawView ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnUndo">
+      <MemberSignature Language="C#" Value="protected virtual void OnUndo ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnExtentsChanged">
+      <MemberSignature Language="C#" Value="protected virtual void OnExtentsChanged (Dia.Rectangle new_extents);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="new_extents" Type="Dia.Rectangle" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="new_extents">a <see cref="T:Dia.Rectangle" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasBox.xml b/doc/en/Dia/CanvasBox.xml
index 9d115cd..db3efbe 100644
--- a/doc/en/Dia/CanvasBox.xml
+++ b/doc/en/Dia/CanvasBox.xml
@@ -39,17 +39,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasBox (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasBox (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasBox" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasBox" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -78,15 +78,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasBox" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/CanvasEditable.xml b/doc/en/Dia/CanvasEditable.xml
index 69c8e09..1b3983f 100644
--- a/doc/en/Dia/CanvasEditable.xml
+++ b/doc/en/Dia/CanvasEditable.xml
@@ -83,10 +83,10 @@
       </Docs>
     </Member>
     <Member MemberName="EditingDone">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.EditingDoneHandler EditingDone;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.EditingDoneHandler EditingDone;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.EditingDoneHandler</ReturnType>
+        <ReturnType>Dia.EditingDoneHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -95,10 +95,10 @@
       </Docs>
     </Member>
     <Member MemberName="StartEditing">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.StartEditingHandler StartEditing;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.StartEditingHandler StartEditing;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.StartEditingHandler</ReturnType>
+        <ReturnType>Dia.StartEditingHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -108,10 +108,10 @@
       </Docs>
     </Member>
     <Member MemberName="TextChanged">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.TextChangedHandler TextChanged;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.TextChangedHandler TextChanged;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.TextChangedHandler</ReturnType>
+        <ReturnType>Dia.TextChangedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
diff --git a/doc/en/Dia/CanvasElement.xml b/doc/en/Dia/CanvasElement.xml
index f74d1f7..ad45b49 100644
--- a/doc/en/Dia/CanvasElement.xml
+++ b/doc/en/Dia/CanvasElement.xml
@@ -69,17 +69,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasElement (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasElement (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasElement" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasElement" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -108,15 +108,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasElement" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/CanvasGroup.xml b/doc/en/Dia/CanvasGroup.xml
index 80b79ce..3f3201e 100644
--- a/doc/en/Dia/CanvasGroup.xml
+++ b/doc/en/Dia/CanvasGroup.xml
@@ -236,17 +236,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasGroup (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasGroup (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasGroup" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasGroup" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -275,24 +275,24 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasGroup" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="Removed">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.RemovedHandler Removed;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.RemovedHandler Removed;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.RemovedHandler</ReturnType>
+        <ReturnType>Dia.RemovedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -301,10 +301,10 @@
       </Docs>
     </Member>
     <Member MemberName="Added">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.AddedHandler Added;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.AddedHandler Added;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.AddedHandler</ReturnType>
+        <ReturnType>Dia.AddedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -312,5 +312,67 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="OverrideRemoved">
+      <MemberSignature Language="C#" Value="protected static void OverrideRemoved (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideAdded">
+      <MemberSignature Language="C#" Value="protected static void OverrideAdded (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnRemoved">
+      <MemberSignature Language="C#" Value="protected virtual bool OnRemoved (Dia.CanvasItem item);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="item" Type="Dia.CanvasItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="item">a <see cref="T:Dia.CanvasItem" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnAdded">
+      <MemberSignature Language="C#" Value="protected virtual bool OnAdded (Dia.CanvasItem item);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="item" Type="Dia.CanvasItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="item">a <see cref="T:Dia.CanvasItem" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasGroupable.xml b/doc/en/Dia/CanvasGroupable.xml
index 0b886e8..0a7a6e2 100644
--- a/doc/en/Dia/CanvasGroupable.xml
+++ b/doc/en/Dia/CanvasGroupable.xml
@@ -208,10 +208,10 @@
       </Docs>
     </Member>
     <Member MemberName="Removed">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.RemovedHandler Removed;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.RemovedHandler Removed;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.RemovedHandler</ReturnType>
+        <ReturnType>Dia.RemovedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -221,10 +221,10 @@
       </Docs>
     </Member>
     <Member MemberName="Added">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.AddedHandler Added;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.AddedHandler Added;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.AddedHandler</ReturnType>
+        <ReturnType>Dia.AddedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
diff --git a/doc/en/Dia/CanvasImage.xml b/doc/en/Dia/CanvasImage.xml
index 283a1f6..8e6b49d 100644
--- a/doc/en/Dia/CanvasImage.xml
+++ b/doc/en/Dia/CanvasImage.xml
@@ -39,17 +39,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasImage (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasImage (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasImage" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasImage" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -92,15 +92,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasImage" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/CanvasItem.xml b/doc/en/Dia/CanvasItem.xml
index 580de72..9196537 100644
--- a/doc/en/Dia/CanvasItem.xml
+++ b/doc/en/Dia/CanvasItem.xml
@@ -25,48 +25,6 @@
   </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="HandlesGetType">
-      <MemberSignature Language="C#" Value="public static uint HandlesGetType ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.UInt32" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="AffineGetType">
-      <MemberSignature Language="C#" Value="public static uint AffineGetType ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.UInt32" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ItemCreate">
-      <MemberSignature Language="C#" Value="public static Dia.CanvasItem ItemCreate (uint object_type);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.CanvasItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="object_type" Type="System.UInt32" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="object_type">a <see cref="T:System.UInt32" /></param>
-        <returns>a <see cref="T:Dia.CanvasItem" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Finalize">
       <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
@@ -581,17 +539,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasItem (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasItem (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasItem" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasItem" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -620,15 +578,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasItem" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -695,24 +653,11 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Handles">
-      <MemberSignature Language="C#" Value="public System.Collections.IList Handles { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Collections.IList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.Collections.IList" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Disconnected">
-      <MemberSignature Language="C#" Value="public event DiaSharp.DisconnectedHandler Disconnected;" />
+      <MemberSignature Language="C#" Value="public event Dia.DisconnectedHandler Disconnected;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.DisconnectedHandler</ReturnType>
+        <ReturnType>Dia.DisconnectedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -721,10 +666,10 @@
       </Docs>
     </Member>
     <Member MemberName="Connected">
-      <MemberSignature Language="C#" Value="public event DiaSharp.ConnectedHandler Connected;" />
+      <MemberSignature Language="C#" Value="public event Dia.ConnectedHandler Connected;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.ConnectedHandler</ReturnType>
+        <ReturnType>Dia.ConnectedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -745,10 +690,10 @@
       </Docs>
     </Member>
     <Member MemberName="HasState">
-      <MemberSignature Language="C#" Value="public event DiaSharp.HasStateHandler HasState;" />
+      <MemberSignature Language="C#" Value="public event Dia.HasStateHandler HasState;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.HasStateHandler</ReturnType>
+        <ReturnType>Dia.HasStateHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -757,10 +702,10 @@
       </Docs>
     </Member>
     <Member MemberName="ZOrder">
-      <MemberSignature Language="C#" Value="public event DiaSharp.ZOrderHandler ZOrder;" />
+      <MemberSignature Language="C#" Value="public event Dia.ZOrderHandler ZOrder;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.ZOrderHandler</ReturnType>
+        <ReturnType>Dia.ZOrderHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -769,10 +714,10 @@
       </Docs>
     </Member>
     <Member MemberName="StateChanged">
-      <MemberSignature Language="C#" Value="public event DiaSharp.StateChangedHandler StateChanged;" />
+      <MemberSignature Language="C#" Value="public event Dia.StateChangedHandler StateChanged;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.StateChangedHandler</ReturnType>
+        <ReturnType>Dia.StateChangedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -781,10 +726,10 @@
       </Docs>
     </Member>
     <Member MemberName="Moved">
-      <MemberSignature Language="C#" Value="public event DiaSharp.MovedHandler Moved;" />
+      <MemberSignature Language="C#" Value="public event Dia.MovedHandler Moved;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.MovedHandler</ReturnType>
+        <ReturnType>Dia.MovedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -856,5 +801,258 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Handles">
+      <MemberSignature Language="C#" Value="public Dia.Handle [] Handles { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Handle[]</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Handle[]" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideDisconnected">
+      <MemberSignature Language="C#" Value="protected static void OverrideDisconnected (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideConnected">
+      <MemberSignature Language="C#" Value="protected static void OverrideConnected (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideNeedUpdate">
+      <MemberSignature Language="C#" Value="protected static void OverrideNeedUpdate (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideHasState">
+      <MemberSignature Language="C#" Value="protected static void OverrideHasState (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideZOrder">
+      <MemberSignature Language="C#" Value="protected static void OverrideZOrder (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideStateChanged">
+      <MemberSignature Language="C#" Value="protected static void OverrideStateChanged (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideMoved">
+      <MemberSignature Language="C#" Value="protected static void OverrideMoved (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="HandlesGetType">
+      <MemberSignature Language="C#" Value="public static GLib.GType HandlesGetType ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="AffineGetType">
+      <MemberSignature Language="C#" Value="public static GLib.GType AffineGetType ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnDisconnected">
+      <MemberSignature Language="C#" Value="protected virtual bool OnDisconnected (Dia.Handle handle);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="handle" Type="Dia.Handle" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="handle">a <see cref="T:Dia.Handle" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnConnected">
+      <MemberSignature Language="C#" Value="protected virtual bool OnConnected (Dia.Handle handle);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="handle" Type="Dia.Handle" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="handle">a <see cref="T:Dia.Handle" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnNeedUpdate">
+      <MemberSignature Language="C#" Value="protected virtual void OnNeedUpdate ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnHasState">
+      <MemberSignature Language="C#" Value="protected virtual bool OnHasState (int state);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="state" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="state">a <see cref="T:System.Int32" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnZOrder">
+      <MemberSignature Language="C#" Value="protected virtual void OnZOrder (int positions);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="positions" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="positions">a <see cref="T:System.Int32" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnStateChanged">
+      <MemberSignature Language="C#" Value="protected virtual void OnStateChanged (int new_state);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="new_state" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="new_state">a <see cref="T:System.Int32" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnMoved">
+      <MemberSignature Language="C#" Value="protected virtual void OnMoved (double dx, double dy, bool interactive);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="dx" Type="System.Double" />
+        <Parameter Name="dy" Type="System.Double" />
+        <Parameter Name="interactive" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="dx">a <see cref="T:System.Double" /></param>
+        <param name="dy">a <see cref="T:System.Double" /></param>
+        <param name="interactive">a <see cref="T:System.Boolean" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasIter.xml b/doc/en/Dia/CanvasIter.xml
index 617900a..0e81448 100644
--- a/doc/en/Dia/CanvasIter.xml
+++ b/doc/en/Dia/CanvasIter.xml
@@ -30,18 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="stamp">
-      <MemberSignature Language="C#" Value="public int stamp;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.CanvasIter New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -83,18 +71,44 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasIter" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Data">
+      <MemberSignature Language="C#" Value="public IntPtr [] Data;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.IntPtr[]</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Stamp">
+      <MemberSignature Language="C#" Value="public int Stamp;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasLine.xml b/doc/en/Dia/CanvasLine.xml
index b946a40..287d5c3 100644
--- a/doc/en/Dia/CanvasLine.xml
+++ b/doc/en/Dia/CanvasLine.xml
@@ -74,17 +74,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasLine (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasLine (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasLine" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasLine" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -114,15 +114,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the Type for the <see cref="T:Dia.CanvasLine" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/CanvasText.xml b/doc/en/Dia/CanvasText.xml
index 4d11806..404a715 100644
--- a/doc/en/Dia/CanvasText.xml
+++ b/doc/en/Dia/CanvasText.xml
@@ -94,17 +94,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasText (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasText (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasText" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasText" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -133,15 +133,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasText" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -302,10 +302,10 @@
       </Docs>
     </Member>
     <Member MemberName="EditingDone">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.EditingDoneHandler EditingDone;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.EditingDoneHandler EditingDone;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.EditingDoneHandler</ReturnType>
+        <ReturnType>Dia.EditingDoneHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -314,10 +314,10 @@
       </Docs>
     </Member>
     <Member MemberName="StartEditing">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.StartEditingHandler StartEditing;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.StartEditingHandler StartEditing;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.StartEditingHandler</ReturnType>
+        <ReturnType>Dia.StartEditingHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -326,10 +326,10 @@
       </Docs>
     </Member>
     <Member MemberName="TextChanged">
-      <MemberSignature Language="C#" Value="public virtual event DiaSharp.TextChangedHandler TextChanged;" />
+      <MemberSignature Language="C#" Value="public virtual event Dia.TextChangedHandler TextChanged;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.TextChangedHandler</ReturnType>
+        <ReturnType>Dia.TextChangedHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -337,5 +337,99 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="OverrideEditingDone">
+      <MemberSignature Language="C#" Value="protected static void OverrideEditingDone (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideStartEditing">
+      <MemberSignature Language="C#" Value="protected static void OverrideStartEditing (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideTextChanged">
+      <MemberSignature Language="C#" Value="protected static void OverrideTextChanged (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnEditingDone">
+      <MemberSignature Language="C#" Value="protected virtual void OnEditingDone (Dia.ShapeText text_shape, string new_text);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="text_shape" Type="Dia.ShapeText" />
+        <Parameter Name="new_text" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="text_shape">a <see cref="T:Dia.ShapeText" /></param>
+        <param name="new_text">a <see cref="T:System.String" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnStartEditing">
+      <MemberSignature Language="C#" Value="protected virtual void OnStartEditing (Dia.ShapeText text_shape);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="text_shape" Type="Dia.ShapeText" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="text_shape">a <see cref="T:Dia.ShapeText" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnTextChanged">
+      <MemberSignature Language="C#" Value="protected virtual void OnTextChanged (Dia.ShapeText text_shape, string new_text);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="text_shape" Type="Dia.ShapeText" />
+        <Parameter Name="new_text" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="text_shape">a <see cref="T:Dia.ShapeText" /></param>
+        <param name="new_text">a <see cref="T:System.String" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasView.xml b/doc/en/Dia/CanvasView.xml
index 24ae369..5700293 100644
--- a/doc/en/Dia/CanvasView.xml
+++ b/doc/en/Dia/CanvasView.xml
@@ -249,17 +249,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasView (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasView (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasView" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasView" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -304,15 +304,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.CanvasView" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -382,19 +382,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="SelectedItems">
-      <MemberSignature Language="C#" Value="public System.Collections.IList SelectedItems { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Collections.IList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.Collections.IList" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="FocusItem">
       <MemberSignature Language="C#" Value="public Dia.CanvasViewItem FocusItem { get; };" />
       <MemberType>Property</MemberType>
@@ -422,10 +409,10 @@
       </Docs>
     </Member>
     <Member MemberName="SelectedItem">
-      <MemberSignature Language="C#" Value="public event DiaSharp.SelectedItemHandler SelectedItem;" />
+      <MemberSignature Language="C#" Value="public event Dia.SelectedItemHandler SelectedItem;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.SelectedItemHandler</ReturnType>
+        <ReturnType>Dia.SelectedItemHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -434,10 +421,10 @@
       </Docs>
     </Member>
     <Member MemberName="FocusedItem">
-      <MemberSignature Language="C#" Value="public event DiaSharp.FocusedItemHandler FocusedItem;" />
+      <MemberSignature Language="C#" Value="public event Dia.FocusedItemHandler FocusedItem;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.FocusedItemHandler</ReturnType>
+        <ReturnType>Dia.FocusedItemHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -446,10 +433,10 @@
       </Docs>
     </Member>
     <Member MemberName="UnselectedItem">
-      <MemberSignature Language="C#" Value="public event DiaSharp.UnselectedItemHandler UnselectedItem;" />
+      <MemberSignature Language="C#" Value="public event Dia.UnselectedItemHandler UnselectedItem;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.UnselectedItemHandler</ReturnType>
+        <ReturnType>Dia.UnselectedItemHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -457,5 +444,108 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="SelectedItems">
+      <MemberSignature Language="C#" Value="public Dia.CanvasViewItem [] SelectedItems { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.CanvasViewItem[]</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.CanvasViewItem[]" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideSelectedItem">
+      <MemberSignature Language="C#" Value="protected static void OverrideSelectedItem (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideFocusedItem">
+      <MemberSignature Language="C#" Value="protected static void OverrideFocusedItem (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideUnselectedItem">
+      <MemberSignature Language="C#" Value="protected static void OverrideUnselectedItem (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnSelectedItem">
+      <MemberSignature Language="C#" Value="protected virtual void OnSelectedItem (Dia.CanvasViewItem selected_item);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="selected_item" Type="Dia.CanvasViewItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="selected_item">a <see cref="T:Dia.CanvasViewItem" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnFocusedItem">
+      <MemberSignature Language="C#" Value="protected virtual void OnFocusedItem (Dia.CanvasViewItem focused_item);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="focused_item" Type="Dia.CanvasViewItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="focused_item">a <see cref="T:Dia.CanvasViewItem" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnUnselectedItem">
+      <MemberSignature Language="C#" Value="protected virtual void OnUnselectedItem (Dia.CanvasViewItem unselected_item);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="unselected_item" Type="Dia.CanvasViewItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="unselected_item">a <see cref="T:Dia.CanvasViewItem" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/CanvasViewItem.xml b/doc/en/Dia/CanvasViewItem.xml
index 105c488..d5be21c 100644
--- a/doc/en/Dia/CanvasViewItem.xml
+++ b/doc/en/Dia/CanvasViewItem.xml
@@ -97,14 +97,14 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the type for the <see cref="Dia.CanvasViewItem" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -202,17 +202,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected CanvasViewItem (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected CanvasViewItem (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.CanvasViewItem" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.CanvasViewItem" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/doc/en/Dia/Constraint.xml b/doc/en/Dia/Constraint.xml
index 6ac1a45..e8e3517 100644
--- a/doc/en/Dia/Constraint.xml
+++ b/doc/en/Dia/Constraint.xml
@@ -138,17 +138,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Constraint (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Constraint (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Constraint" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Constraint" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -177,15 +177,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Constraint" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -203,5 +203,47 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="NeedResolve">
+      <MemberSignature Language="C#" Value="public event Dia.NeedResolveHandler NeedResolve;" />
+      <MemberType>Event</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.NeedResolveHandler</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideNeedResolve">
+      <MemberSignature Language="C#" Value="protected static void OverrideNeedResolve (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnNeedResolve">
+      <MemberSignature Language="C#" Value="protected virtual void OnNeedResolve (Dia.Variable var);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="var" Type="Dia.Variable" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="var">a <see cref="T:Dia.Variable" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/ConstraintFunc.xml b/doc/en/Dia/ConstraintFunc.xml
index 53b3513..3ffd7af 100644
--- a/doc/en/Dia/ConstraintFunc.xml
+++ b/doc/en/Dia/ConstraintFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="ConstraintFunc" FullName="Dia.ConstraintFunc">
-  <TypeSignature Language="C#" Value="public sealed delegate void ConstraintFunc ();" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed delegate void ConstraintFunc (Dia.Constraint constraint, Dia.Variable variable, double constant);" />
   <AssemblyInfo>
     <AssemblyName>diacanvas-sharp</AssemblyName>
     <AssemblyPublicKey />
diff --git a/doc/en/Dia/EventButton.xml b/doc/en/Dia/EventButton.xml
index 4c2e861..a9d66f7 100644
--- a/doc/en/Dia/EventButton.xml
+++ b/doc/en/Dia/EventButton.xml
@@ -30,66 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="type">
-      <MemberSignature Language="C#" Value="public Dia.EventType type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="x">
-      <MemberSignature Language="C#" Value="public double x;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="y">
-      <MemberSignature Language="C#" Value="public double y;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="modifier">
-      <MemberSignature Language="C#" Value="public Dia.EventMask modifier;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventMask</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="button">
-      <MemberSignature Language="C#" Value="public uint button;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.EventButton New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -106,5 +46,70 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Type">
+      <MemberSignature Language="C#" Value="public Dia.EventType Type;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="X">
+      <MemberSignature Language="C#" Value="public double X;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Y">
+      <MemberSignature Language="C#" Value="public double Y;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Modifier">
+      <MemberSignature Language="C#" Value="public Dia.EventMask Modifier;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventMask</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Button">
+      <MemberSignature Language="C#" Value="public uint Button;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/EventFocus.xml b/doc/en/Dia/EventFocus.xml
index b9c2fbe..f497241 100644
--- a/doc/en/Dia/EventFocus.xml
+++ b/doc/en/Dia/EventFocus.xml
@@ -30,18 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="type">
-      <MemberSignature Language="C#" Value="public Dia.EventType type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.EventFocus New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -58,5 +46,18 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Type">
+      <MemberSignature Language="C#" Value="public Dia.EventType Type;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/EventKey.xml b/doc/en/Dia/EventKey.xml
index 457af30..8eb6927 100644
--- a/doc/en/Dia/EventKey.xml
+++ b/doc/en/Dia/EventKey.xml
@@ -30,66 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="type">
-      <MemberSignature Language="C#" Value="public Dia.EventType type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="keyval">
-      <MemberSignature Language="C#" Value="public uint keyval;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="length">
-      <MemberSignature Language="C#" Value="public int length;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="str1ng">
-      <MemberSignature Language="C#" Value="public string str1ng;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="modifier">
-      <MemberSignature Language="C#" Value="public Dia.EventMask modifier;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventMask</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.EventKey New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -106,5 +46,70 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Type">
+      <MemberSignature Language="C#" Value="public Dia.EventType Type;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Keyval">
+      <MemberSignature Language="C#" Value="public uint Keyval;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Length">
+      <MemberSignature Language="C#" Value="public int Length;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Str1ng">
+      <MemberSignature Language="C#" Value="public string Str1ng;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Modifier">
+      <MemberSignature Language="C#" Value="public Dia.EventMask Modifier;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventMask</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/EventMotion.xml b/doc/en/Dia/EventMotion.xml
index 3e14803..a8cfb43 100644
--- a/doc/en/Dia/EventMotion.xml
+++ b/doc/en/Dia/EventMotion.xml
@@ -30,78 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="type">
-      <MemberSignature Language="C#" Value="public Dia.EventType type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="x">
-      <MemberSignature Language="C#" Value="public double x;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="y">
-      <MemberSignature Language="C#" Value="public double y;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="modifier">
-      <MemberSignature Language="C#" Value="public Dia.EventMask modifier;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.EventMask</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="dx">
-      <MemberSignature Language="C#" Value="public double dx;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="dy">
-      <MemberSignature Language="C#" Value="public double dy;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.EventMotion New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -118,5 +46,83 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Type">
+      <MemberSignature Language="C#" Value="public Dia.EventType Type;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="X">
+      <MemberSignature Language="C#" Value="public double X;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Y">
+      <MemberSignature Language="C#" Value="public double Y;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Modifier">
+      <MemberSignature Language="C#" Value="public Dia.EventMask Modifier;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.EventMask</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Dx">
+      <MemberSignature Language="C#" Value="public double Dx;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Dy">
+      <MemberSignature Language="C#" Value="public double Dy;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/ExportSVG.xml b/doc/en/Dia/ExportSVG.xml
index 97b5bc9..ce8a1f7 100644
--- a/doc/en/Dia/ExportSVG.xml
+++ b/doc/en/Dia/ExportSVG.xml
@@ -69,17 +69,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ExportSVG (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected ExportSVG (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.ExportSVG" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.ExportSVG" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -108,15 +108,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ExportSVG" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/Global.xml b/doc/en/Dia/Global.xml
index 0b18fe4..9b91209 100644
--- a/doc/en/Dia/Global.xml
+++ b/doc/en/Dia/Global.xml
@@ -18,19 +18,6 @@
   <Interfaces />
   <Attributes />
   <Members>
-    <Member MemberName="EventGetType">
-      <MemberSignature Language="C#" Value="public static uint EventGetType ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.UInt32" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="ExportPrint">
       <MemberSignature Language="C#" Value="public static void ExportPrint (Gnome.PrintJob gpm, Dia.Canvas canvas);" />
       <MemberType>Method</MemberType>
@@ -59,5 +46,18 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="EventGetType">
+      <MemberSignature Language="C#" Value="public static GLib.GType EventGetType ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/Handle.xml b/doc/en/Dia/Handle.xml
index a2c91b8..3d3e225 100644
--- a/doc/en/Dia/Handle.xml
+++ b/doc/en/Dia/Handle.xml
@@ -235,17 +235,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Handle (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Handle (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Handle" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Handle" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -306,15 +306,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Handle" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/HandleLayer.xml b/doc/en/Dia/HandleLayer.xml
index 151e0bd..2bbbb59 100644
--- a/doc/en/Dia/HandleLayer.xml
+++ b/doc/en/Dia/HandleLayer.xml
@@ -101,17 +101,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected HandleLayer (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected HandleLayer (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.HandleLayer" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.HandleLayer" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -140,15 +140,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.HandleLayer" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/Point.xml b/doc/en/Dia/Point.xml
index 297def4..03ce70e 100644
--- a/doc/en/Dia/Point.xml
+++ b/doc/en/Dia/Point.xml
@@ -30,30 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="x">
-      <MemberSignature Language="C#" Value="public double x;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="y">
-      <MemberSignature Language="C#" Value="public double y;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.Point New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -100,18 +76,44 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Point" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="X">
+      <MemberSignature Language="C#" Value="public double X;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Y">
+      <MemberSignature Language="C#" Value="public double Y;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/Rectangle.xml b/doc/en/Dia/Rectangle.xml
index 5518d45..8b05750 100644
--- a/doc/en/Dia/Rectangle.xml
+++ b/doc/en/Dia/Rectangle.xml
@@ -30,54 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="left">
-      <MemberSignature Language="C#" Value="public double left;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="top">
-      <MemberSignature Language="C#" Value="public double top;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="right">
-      <MemberSignature Language="C#" Value="public double right;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="bottom">
-      <MemberSignature Language="C#" Value="public double bottom;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.Rectangle New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -110,18 +62,70 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Rectangle" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Left">
+      <MemberSignature Language="C#" Value="public double Left;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Top">
+      <MemberSignature Language="C#" Value="public double Top;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Right">
+      <MemberSignature Language="C#" Value="public double Right;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Bottom">
+      <MemberSignature Language="C#" Value="public double Bottom;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/SPoint.xml b/doc/en/Dia/SPoint.xml
index 8e0c7ca..8b8c848 100644
--- a/doc/en/Dia/SPoint.xml
+++ b/doc/en/Dia/SPoint.xml
@@ -47,7 +47,7 @@
       </Docs>
     </Member>
     <Member MemberName="x">
-      <MemberSignature Language="C#" Value="public Dia.Variable x { get; };" />
+      <MemberSignature Language="C#" Value="public Dia.Variable x { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Dia.Variable</ReturnType>
@@ -60,7 +60,7 @@
       </Docs>
     </Member>
     <Member MemberName="y">
-      <MemberSignature Language="C#" Value="public Dia.Variable y { get; };" />
+      <MemberSignature Language="C#" Value="public Dia.Variable y { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Dia.Variable</ReturnType>
diff --git a/doc/en/Dia/Selector.xml b/doc/en/Dia/Selector.xml
index 6b7c990..870d0b9 100644
--- a/doc/en/Dia/Selector.xml
+++ b/doc/en/Dia/Selector.xml
@@ -39,17 +39,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Selector (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Selector (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Selector" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Selector" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -78,15 +78,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Selector" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/Shape.xml b/doc/en/Dia/Shape.xml
index 6645a03..985c804 100644
--- a/doc/en/Dia/Shape.xml
+++ b/doc/en/Dia/Shape.xml
@@ -18,98 +18,6 @@
   <Interfaces />
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Dia.Shape Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="type">
-      <MemberSignature Language="C#" Value="public Dia.ShapeType type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.ShapeType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="visibility">
-      <MemberSignature Language="C#" Value="public uint visibility;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="update_cnt">
-      <MemberSignature Language="C#" Value="public uint update_cnt;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="color">
-      <MemberSignature Language="C#" Value="public uint color;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Dia.Shape New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Dia.Shape" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Dia.Shape New (Dia.ShapeType type);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="type" Type="Dia.ShapeType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="type">a <see cref="T:Dia.ShapeType" /></param>
-        <returns>a <see cref="T:Dia.Shape" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="XGetPangoLayout">
       <MemberSignature Language="C#" Value="public static Pango.Layout XGetPangoLayout ();" />
       <MemberType>Method</MemberType>
@@ -427,15 +335,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Shape" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -484,5 +392,44 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Shape (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Shape (Dia.ShapeType type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="type" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="type">a <see cref="T:System.Int32" /></param>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected Shape ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/ShapeBezier.xml b/doc/en/Dia/ShapeBezier.xml
index 694bddc..3af73c6 100644
--- a/doc/en/Dia/ShapeBezier.xml
+++ b/doc/en/Dia/ShapeBezier.xml
@@ -30,78 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill_color">
-      <MemberSignature Language="C#" Value="public uint fill_color;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill">
-      <MemberSignature Language="C#" Value="public uint fill;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="join">
-      <MemberSignature Language="C#" Value="public uint join;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="cap">
-      <MemberSignature Language="C#" Value="public uint cap;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="line_width">
-      <MemberSignature Language="C#" Value="public double line_width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapeBezier New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -254,15 +182,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ShapeBezier" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -293,24 +221,101 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="FillColor">
+      <MemberSignature Language="C#" Value="public uint FillColor;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Fill">
+      <MemberSignature Language="C#" Value="public uint Fill;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Join">
+      <MemberSignature Language="C#" Value="public uint Join;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Cap">
+      <MemberSignature Language="C#" Value="public uint Cap;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="LineWidth">
+      <MemberSignature Language="C#" Value="public double LineWidth;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetDash">
-      <MemberSignature Language="C#" Value="public static void SetDash (Dia.Shape shape, double offset, uint n_dash, out double dash);" />
+      <MemberSignature Language="C#" Value="public static double SetDash (Dia.Shape shape, double offset, uint n_dash);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="shape" Type="Dia.Shape" />
         <Parameter Name="offset" Type="System.Double" />
         <Parameter Name="n_dash" Type="System.UInt32" />
-        <Parameter Name="dash" Type="System.Double" RefType="out" />
       </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="shape">a <see cref="T:Dia.Shape" /></param>
         <param name="offset">a <see cref="T:System.Double" /></param>
         <param name="n_dash">a <see cref="T:System.UInt32" /></param>
-        <param name="dash">a <see cref="T:System.Double" /></param>
+        <returns>a <see cref="T:System.Double" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Dia/ShapeClip.xml b/doc/en/Dia/ShapeClip.xml
index b76acdb..b0676f4 100644
--- a/doc/en/Dia/ShapeClip.xml
+++ b/doc/en/Dia/ShapeClip.xml
@@ -30,30 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="clip">
-      <MemberSignature Language="C#" Value="public Art.DRect clip;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Art.DRect</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapeClip New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -70,5 +46,31 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Clip">
+      <MemberSignature Language="C#" Value="public Art.DRect Clip;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Art.DRect</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/ShapeEllipse.xml b/doc/en/Dia/ShapeEllipse.xml
index 692a07f..5b24c22 100644
--- a/doc/en/Dia/ShapeEllipse.xml
+++ b/doc/en/Dia/ShapeEllipse.xml
@@ -30,90 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="center">
-      <MemberSignature Language="C#" Value="public Dia.Point center;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Point</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="width">
-      <MemberSignature Language="C#" Value="public double width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="height">
-      <MemberSignature Language="C#" Value="public double height;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill_color">
-      <MemberSignature Language="C#" Value="public uint fill_color;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill">
-      <MemberSignature Language="C#" Value="public uint fill;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="line_width">
-      <MemberSignature Language="C#" Value="public double line_width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapeEllipse New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -215,15 +131,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ShapeEllipse" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -241,24 +157,114 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Center">
+      <MemberSignature Language="C#" Value="public Dia.Point Center;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Point</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Width">
+      <MemberSignature Language="C#" Value="public double Width;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Height">
+      <MemberSignature Language="C#" Value="public double Height;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="FillColor">
+      <MemberSignature Language="C#" Value="public uint FillColor;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Fill">
+      <MemberSignature Language="C#" Value="public uint Fill;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="LineWidth">
+      <MemberSignature Language="C#" Value="public double LineWidth;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetDash">
-      <MemberSignature Language="C#" Value="public static void SetDash (Dia.Shape shape, double offset, uint n_dash, out double dash);" />
+      <MemberSignature Language="C#" Value="public static double SetDash (Dia.Shape shape, double offset, uint n_dash);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="shape" Type="Dia.Shape" />
         <Parameter Name="offset" Type="System.Double" />
         <Parameter Name="n_dash" Type="System.UInt32" />
-        <Parameter Name="dash" Type="System.Double" RefType="out" />
       </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="shape">a <see cref="T:Dia.Shape" /></param>
         <param name="offset">a <see cref="T:System.Double" /></param>
         <param name="n_dash">a <see cref="T:System.UInt32" /></param>
-        <param name="dash">a <see cref="T:System.Double" /></param>
+        <returns>a <see cref="T:System.Double" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Dia/ShapeImage.xml b/doc/en/Dia/ShapeImage.xml
index 1bc72d9..cd5b81e 100644
--- a/doc/en/Dia/ShapeImage.xml
+++ b/doc/en/Dia/ShapeImage.xml
@@ -30,18 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapeImage New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -93,15 +81,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ShapeImage" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -119,5 +107,31 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Affine">
+      <MemberSignature Language="C#" Value="public double [] Affine;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double[]</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/ShapePath.xml b/doc/en/Dia/ShapePath.xml
index 2229a99..535de79 100644
--- a/doc/en/Dia/ShapePath.xml
+++ b/doc/en/Dia/ShapePath.xml
@@ -30,78 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill_color">
-      <MemberSignature Language="C#" Value="public uint fill_color;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="fill">
-      <MemberSignature Language="C#" Value="public uint fill;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="join">
-      <MemberSignature Language="C#" Value="public uint join;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="cap">
-      <MemberSignature Language="C#" Value="public uint cap;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="line_width">
-      <MemberSignature Language="C#" Value="public double line_width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapePath New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -254,15 +182,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ShapePath" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -293,24 +221,101 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="FillColor">
+      <MemberSignature Language="C#" Value="public uint FillColor;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Fill">
+      <MemberSignature Language="C#" Value="public uint Fill;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Join">
+      <MemberSignature Language="C#" Value="public uint Join;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Cap">
+      <MemberSignature Language="C#" Value="public uint Cap;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="LineWidth">
+      <MemberSignature Language="C#" Value="public double LineWidth;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetDash">
-      <MemberSignature Language="C#" Value="public static void SetDash (Dia.Shape shape, double offset, uint n_dash, out double dash);" />
+      <MemberSignature Language="C#" Value="public static double SetDash (Dia.Shape shape, double offset, uint n_dash);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="shape" Type="Dia.Shape" />
         <Parameter Name="offset" Type="System.Double" />
         <Parameter Name="n_dash" Type="System.UInt32" />
-        <Parameter Name="dash" Type="System.Double" RefType="out" />
       </Parameters>
       <Docs>
         <summary>To be added</summary>
         <param name="shape">a <see cref="T:Dia.Shape" /></param>
         <param name="offset">a <see cref="T:System.Double" /></param>
         <param name="n_dash">a <see cref="T:System.UInt32" /></param>
-        <param name="dash">a <see cref="T:System.Double" /></param>
+        <returns>a <see cref="T:System.Double" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Dia/ShapeText.xml b/doc/en/Dia/ShapeText.xml
index e74b4ce..4bb5491 100644
--- a/doc/en/Dia/ShapeText.xml
+++ b/doc/en/Dia/ShapeText.xml
@@ -30,138 +30,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="shape">
-      <MemberSignature Language="C#" Value="public Dia.Shape shape;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Shape</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="text">
-      <MemberSignature Language="C#" Value="public string text;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="need_free">
-      <MemberSignature Language="C#" Value="public bool need_free;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="justify">
-      <MemberSignature Language="C#" Value="public bool justify;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="markup">
-      <MemberSignature Language="C#" Value="public bool markup;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="line_spacing">
-      <MemberSignature Language="C#" Value="public double line_spacing;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="alignment">
-      <MemberSignature Language="C#" Value="public Pango.Alignment alignment;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Pango.Alignment</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="text_width">
-      <MemberSignature Language="C#" Value="public double text_width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="max_width">
-      <MemberSignature Language="C#" Value="public double max_width;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="max_height">
-      <MemberSignature Language="C#" Value="public double max_height;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="cursor">
-      <MemberSignature Language="C#" Value="public int cursor;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Dia.ShapeText New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -401,15 +269,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.ShapeText" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -427,19 +295,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="wrap_mode">
-      <MemberSignature Language="C#" Value="public Dia.WrapMode wrap_mode;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.WrapMode</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="CursorFromPos">
       <MemberSignature Language="C#" Value="public static bool CursorFromPos (Dia.Shape shape, Dia.Point pos, out int cursor);" />
       <MemberType>Method</MemberType>
@@ -494,5 +349,174 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Text">
+      <MemberSignature Language="C#" Value="public string Text;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="NeedFree">
+      <MemberSignature Language="C#" Value="public bool NeedFree;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Justify">
+      <MemberSignature Language="C#" Value="public bool Justify;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Markup">
+      <MemberSignature Language="C#" Value="public bool Markup;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WrapMode">
+      <MemberSignature Language="C#" Value="public Dia.WrapMode WrapMode;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.WrapMode</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="LineSpacing">
+      <MemberSignature Language="C#" Value="public double LineSpacing;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Alignment">
+      <MemberSignature Language="C#" Value="public Pango.Alignment Alignment;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.Alignment</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="TextWidth">
+      <MemberSignature Language="C#" Value="public double TextWidth;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MaxWidth">
+      <MemberSignature Language="C#" Value="public double MaxWidth;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MaxHeight">
+      <MemberSignature Language="C#" Value="public double MaxHeight;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Affine">
+      <MemberSignature Language="C#" Value="public double [] Affine;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Double[]</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Cursor">
+      <MemberSignature Language="C#" Value="public int Cursor;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="shape">
+      <MemberSignature Language="C#" Value="public Dia.Shape shape { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Dia.Shape</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Shape" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/Solver.xml b/doc/en/Dia/Solver.xml
index 4f984b6..8c75095 100644
--- a/doc/en/Dia/Solver.xml
+++ b/doc/en/Dia/Solver.xml
@@ -51,17 +51,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Solver (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Solver (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Solver" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Solver" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -90,18 +90,48 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Solver" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="AddConstraint">
+      <MemberSignature Language="C#" Value="public void AddConstraint (Dia.Constraint constraint);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="constraint" Type="Dia.Constraint" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="constraint">a <see cref="T:Dia.Constraint" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="RemoveConstraint">
+      <MemberSignature Language="C#" Value="public void RemoveConstraint (Dia.Constraint constraint);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="constraint" Type="Dia.Constraint" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="constraint">a <see cref="T:Dia.Constraint" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/StackTool.xml b/doc/en/Dia/StackTool.xml
index 0097a63..60d357c 100644
--- a/doc/en/Dia/StackTool.xml
+++ b/doc/en/Dia/StackTool.xml
@@ -66,17 +66,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected StackTool (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected StackTool (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.StackTool" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.StackTool" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -105,15 +105,15 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.StackTool" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/Dia/Tool.xml b/doc/en/Dia/Tool.xml
index 6a2530a..6c693d2 100644
--- a/doc/en/Dia/Tool.xml
+++ b/doc/en/Dia/Tool.xml
@@ -129,17 +129,17 @@
       </Docs>
     </Member>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Tool (GLib.Type gtype);" />
+      <MemberSignature Language="C#" Value="protected Tool (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
       <ReturnValue />
       <Parameters>
-        <Parameter Name="gtype" Type="GLib.Type" />
+        <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
         <summary>Internal constructor.</summary>
-        <param name="gtype">a <see cref="T:GLib.Type" /> for the this type.</param>
-        <returns>a <see cref="T:Dia.Tool" /> created using the provided <see cref="T:GLib.Type" />.</returns>
-        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.Type" /> assigned to it. This is not typically used by C# code.</remarks>
+        <param name="gtype">a <see cref="T:GLib.GType" /> for the this type.</param>
+        <returns>a <see cref="T:Dia.Tool" /> created using the provided <see cref="T:GLib.GType" />.</returns>
+        <remarks>This is a constructor used by derivative types that would have their own <see cref="T:GLib.GType" /> assigned to it. This is not typically used by C# code.</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -168,24 +168,24 @@
       </Docs>
     </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Tool" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="ButtonPressEvent">
-      <MemberSignature Language="C#" Value="public event DiaSharp.ButtonPressEventHandler ButtonPressEvent;" />
+      <MemberSignature Language="C#" Value="public event Dia.ButtonPressEventHandler ButtonPressEvent;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.ButtonPressEventHandler</ReturnType>
+        <ReturnType>Dia.ButtonPressEventHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -194,10 +194,10 @@
       </Docs>
     </Member>
     <Member MemberName="MotionNotifyEvent">
-      <MemberSignature Language="C#" Value="public event DiaSharp.MotionNotifyEventHandler MotionNotifyEvent;" />
+      <MemberSignature Language="C#" Value="public event Dia.MotionNotifyEventHandler MotionNotifyEvent;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.MotionNotifyEventHandler</ReturnType>
+        <ReturnType>Dia.MotionNotifyEventHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -206,10 +206,10 @@
       </Docs>
     </Member>
     <Member MemberName="ButtonReleaseEvent">
-      <MemberSignature Language="C#" Value="public event DiaSharp.ButtonReleaseEventHandler ButtonReleaseEvent;" />
+      <MemberSignature Language="C#" Value="public event Dia.ButtonReleaseEventHandler ButtonReleaseEvent;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.ButtonReleaseEventHandler</ReturnType>
+        <ReturnType>Dia.ButtonReleaseEventHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -218,10 +218,10 @@
       </Docs>
     </Member>
     <Member MemberName="KeyPressEvent">
-      <MemberSignature Language="C#" Value="public event DiaSharp.KeyPressEventHandler KeyPressEvent;" />
+      <MemberSignature Language="C#" Value="public event Dia.KeyPressEventHandler KeyPressEvent;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.KeyPressEventHandler</ReturnType>
+        <ReturnType>Dia.KeyPressEventHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -230,10 +230,10 @@
       </Docs>
     </Member>
     <Member MemberName="KeyReleaseEvent">
-      <MemberSignature Language="C#" Value="public event DiaSharp.KeyReleaseEventHandler KeyReleaseEvent;" />
+      <MemberSignature Language="C#" Value="public event Dia.KeyReleaseEventHandler KeyReleaseEvent;" />
       <MemberType>Event</MemberType>
       <ReturnValue>
-        <ReturnType>DiaSharp.KeyReleaseEventHandler</ReturnType>
+        <ReturnType>Dia.KeyReleaseEventHandler</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
@@ -241,5 +241,170 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="OverrideButtonPressEvent">
+      <MemberSignature Language="C#" Value="protected static void OverrideButtonPressEvent (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideMotionNotifyEvent">
+      <MemberSignature Language="C#" Value="protected static void OverrideMotionNotifyEvent (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideButtonReleaseEvent">
+      <MemberSignature Language="C#" Value="protected static void OverrideButtonReleaseEvent (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideKeyPressEvent">
+      <MemberSignature Language="C#" Value="protected static void OverrideKeyPressEvent (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OverrideKeyReleaseEvent">
+      <MemberSignature Language="C#" Value="protected static void OverrideKeyReleaseEvent (GLib.GType gtype);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnButtonPressEvent">
+      <MemberSignature Language="C#" Value="protected virtual bool OnButtonPressEvent (Dia.CanvasView view, Gdk.EventButton button);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="view" Type="Dia.CanvasView" />
+        <Parameter Name="button" Type="Gdk.EventButton" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="view">a <see cref="T:Dia.CanvasView" /></param>
+        <param name="button">a <see cref="T:Gdk.EventButton" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnMotionNotifyEvent">
+      <MemberSignature Language="C#" Value="protected virtual bool OnMotionNotifyEvent (Dia.CanvasView view, Gdk.EventMotion button);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="view" Type="Dia.CanvasView" />
+        <Parameter Name="button" Type="Gdk.EventMotion" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="view">a <see cref="T:Dia.CanvasView" /></param>
+        <param name="button">a <see cref="T:Gdk.EventMotion" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnButtonReleaseEvent">
+      <MemberSignature Language="C#" Value="protected virtual bool OnButtonReleaseEvent (Dia.CanvasView view, Gdk.EventButton button);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="view" Type="Dia.CanvasView" />
+        <Parameter Name="button" Type="Gdk.EventButton" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="view">a <see cref="T:Dia.CanvasView" /></param>
+        <param name="button">a <see cref="T:Gdk.EventButton" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnKeyPressEvent">
+      <MemberSignature Language="C#" Value="protected virtual bool OnKeyPressEvent (Dia.CanvasView view, Gdk.EventKey button);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="view" Type="Dia.CanvasView" />
+        <Parameter Name="button" Type="Gdk.EventKey" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="view">a <see cref="T:Dia.CanvasView" /></param>
+        <param name="button">a <see cref="T:Gdk.EventKey" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="OnKeyReleaseEvent">
+      <MemberSignature Language="C#" Value="protected virtual bool OnKeyReleaseEvent (Dia.CanvasView view, Gdk.EventKey button);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="view" Type="Dia.CanvasView" />
+        <Parameter Name="button" Type="Gdk.EventKey" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="view">a <see cref="T:Dia.CanvasView" /></param>
+        <param name="button">a <see cref="T:Gdk.EventKey" /></param>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Dia/Variable.xml b/doc/en/Dia/Variable.xml
index 21ecb15..1163117 100644
--- a/doc/en/Dia/Variable.xml
+++ b/doc/en/Dia/Variable.xml
@@ -18,93 +18,16 @@
   <Interfaces />
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Dia.Variable Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Variable</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="parent">
-      <MemberSignature Language="C#" Value="public GLib.Object parent;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.Object</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="value">
-      <MemberSignature Language="C#" Value="public double value;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="strength">
-      <MemberSignature Language="C#" Value="public Dia.Strength strength;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Strength</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Dia.Variable New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Variable</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Dia.Variable" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Dia.Variable New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Dia.Variable</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Dia.Variable" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static uint GType { get; };" />
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
+        <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>Gets the type for the <see cref="T:Dia.Variable" /></summary>
-        <returns>A <see cref="T:System.UInt32" /> number representing the <see cref="GLib.Type" /></returns>
+        <returns>A <see cref="T:GLib.GType" /> representing this type</returns>
         <remarks>
         </remarks>
       </Docs>
@@ -135,5 +58,30 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Variable (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Dia.Variable" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Variable ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Dia.Variable" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file