diff --git a/ChangeLog b/ChangeLog
index 8166b4a03..fcb025ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-05  Mike Kestner  <mkestner@novell.com>
+
+	* generator/Field.cs : deal with LPGen/LPUGen fields.
+
+2005-01-05  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/gtk-api.raw : regen.
+	* sources/gtk-sharp-sources.xml : exclude gtkiconthemeparser.h.
+	[Fixes #70898]
+
 2005-01-05  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Gtk.metadata : hide some internal Image*Data structs.
diff --git a/doc/en/Gda/Numeric.xml b/doc/en/Gda/Numeric.xml
index a01fb50ad..5c6c22ec3 100644
--- a/doc/en/Gda/Numeric.xml
+++ b/doc/en/Gda/Numeric.xml
@@ -62,30 +62,30 @@
       </Docs>
     </Member>
     <Member MemberName="Precision">
-      <MemberSignature Language="C#" Value="public long Precision;" />
-      <MemberType>Field</MemberType>
+      <MemberSignature Language="C#" Value="public long Precision { set; get; };" />
+      <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Int64</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
     <Member MemberName="Width">
-      <MemberSignature Language="C#" Value="public long Width;" />
-      <MemberType>Field</MemberType>
+      <MemberSignature Language="C#" Value="public long Width { set; get; };" />
+      <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Int64</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gda/Time.xml b/doc/en/Gda/Time.xml
index b6220eb72..c15fd1851 100644
--- a/doc/en/Gda/Time.xml
+++ b/doc/en/Gda/Time.xml
@@ -87,7 +87,7 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Timezone">
+    <Member MemberName="Timezone" Deprecated="true">
       <MemberSignature Language="C#" Value="public long Timezone;" />
       <MemberType>Field</MemberType>
       <ReturnValue>
@@ -100,5 +100,18 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Timezone">
+      <MemberSignature Language="C#" Value="public long Timezone { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Gda/Timestamp.xml b/doc/en/Gda/Timestamp.xml
index 937e35e9c..9b8909e2b 100644
--- a/doc/en/Gda/Timestamp.xml
+++ b/doc/en/Gda/Timestamp.xml
@@ -127,30 +127,30 @@
       </Docs>
     </Member>
     <Member MemberName="Fraction">
-      <MemberSignature Language="C#" Value="public ulong Fraction;" />
-      <MemberType>Field</MemberType>
+      <MemberSignature Language="C#" Value="public ulong Fraction { set; get; };" />
+      <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.UInt64</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:System.UInt64" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
     <Member MemberName="Timezone">
-      <MemberSignature Language="C#" Value="public long Timezone;" />
-      <MemberType>Field</MemberType>
+      <MemberSignature Language="C#" Value="public long Timezone { set; get; };" />
+      <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Int64</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gda/Value.xml b/doc/en/Gda/Value.xml
index b127b7431..e120ff540 100644
--- a/doc/en/Gda/Value.xml
+++ b/doc/en/Gda/Value.xml
@@ -1167,19 +1167,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="BinaryLength">
-      <MemberSignature Language="C#" Value="public long BinaryLength;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewTimestampFromTimet">
       <MemberSignature Language="C#" Value="public static Gda.Value NewTimestampFromTimet (DateTime val);" />
       <MemberType>Method</MemberType>
@@ -1209,5 +1196,18 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="BinaryLength">
+      <MemberSignature Language="C#" Value="public long BinaryLength { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Gnome.Vfs/XferProgressInfo.xml b/doc/en/Gnome.Vfs/XferProgressInfo.xml
index ef4947e89..615ab75f3 100644
--- a/doc/en/Gnome.Vfs/XferProgressInfo.xml
+++ b/doc/en/Gnome.Vfs/XferProgressInfo.xml
@@ -96,84 +96,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="FileIndex">
-      <MemberSignature Language="C#" Value="public ulong FileIndex;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FilesTotal">
-      <MemberSignature Language="C#" Value="public ulong FilesTotal;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BytesTotal">
-      <MemberSignature Language="C#" Value="public long BytesTotal;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="FileSize">
-      <MemberSignature Language="C#" Value="public long FileSize;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BytesCopied">
-      <MemberSignature Language="C#" Value="public long BytesCopied;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="TotalBytesCopied">
-      <MemberSignature Language="C#" Value="public long TotalBytesCopied;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="DuplicateName">
       <MemberSignature Language="C#" Value="public string DuplicateName;" />
       <MemberType>Field</MemberType>
@@ -229,5 +151,83 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="FileIndex">
+      <MemberSignature Language="C#" Value="public ulong FileIndex { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.UInt64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="FilesTotal">
+      <MemberSignature Language="C#" Value="public ulong FilesTotal { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.UInt64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="BytesTotal">
+      <MemberSignature Language="C#" Value="public long BytesTotal { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="FileSize">
+      <MemberSignature Language="C#" Value="public long FileSize { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="BytesCopied">
+      <MemberSignature Language="C#" Value="public long BytesCopied { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="TotalBytesCopied">
+      <MemberSignature Language="C#" Value="public long TotalBytesCopied { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/IconThemeFile.xml b/doc/en/Gtk/IconThemeFile.xml
deleted file mode 100644
index 1ca379e01..000000000
--- a/doc/en/Gtk/IconThemeFile.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Type Name="IconThemeFile" FullName="Gtk.IconThemeFile">
-  <TypeSignature Language="C#" Value="public class IconThemeFile : GLib.Opaque, IWrapper" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Do not use.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>GLib.Opaque</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>GLib.IWrapper</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public IconThemeFile (IntPtr raw);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>Public constructor for internal use only. Do not use.</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gtk.IconThemeFile" /></returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/IconThemeFileLineFunc.xml b/doc/en/Gtk/IconThemeFileLineFunc.xml
deleted file mode 100644
index 3b1a4aa56..000000000
--- a/doc/en/Gtk/IconThemeFileLineFunc.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Type Name="IconThemeFileLineFunc" FullName="Gtk.IconThemeFileLineFunc">
-  <TypeSignature Language="C#" Value="public sealed delegate void IconThemeFileLineFunc (Gtk.IconThemeFile df, string key, string locale, string value);" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Delegate for handling a line of an icon theme file.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ICloneable</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.Runtime.Serialization.ISerializable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Parameters>
-    <Parameter Name="df" Type="Gtk.IconThemeFile" />
-    <Parameter Name="key" Type="System.String" />
-    <Parameter Name="locale" Type="System.String" />
-    <Parameter Name="value" Type="System.String" />
-  </Parameters>
-</Type>
diff --git a/doc/en/Gtk/IconThemeFileParseError.xml b/doc/en/Gtk/IconThemeFileParseError.xml
deleted file mode 100644
index 2cd77ffb6..000000000
--- a/doc/en/Gtk/IconThemeFileParseError.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<Type Name="IconThemeFileParseError" FullName="Gtk.IconThemeFileParseError">
-  <TypeSignature Language="C#" Value="public enum IconThemeFileParseError" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Possible errors found while parsing an icon theme file.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.Enum</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.IComparable</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IConvertible</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.IFormattable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members>
-    <Member MemberName="Syntax">
-      <MemberSignature Language="C#" Value="Syntax" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.IconThemeFileParseError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>There was an error in the file syntax.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Escapes">
-      <MemberSignature Language="C#" Value="Escapes" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.IconThemeFileParseError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The escapes in the file were invalid.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Chars">
-      <MemberSignature Language="C#" Value="Chars" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.IconThemeFileParseError</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>The file contained invalid characters.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="value__">
-      <MemberSignature Language="C#" Value="value__" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>Internal field.</summary>
-        <remarks>Do not use.</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/doc/en/Gtk/IconThemeFileSectionFunc.xml b/doc/en/Gtk/IconThemeFileSectionFunc.xml
deleted file mode 100644
index 66a034085..000000000
--- a/doc/en/Gtk/IconThemeFileSectionFunc.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Type Name="IconThemeFileSectionFunc" FullName="Gtk.IconThemeFileSectionFunc">
-  <TypeSignature Language="C#" Value="public sealed delegate void IconThemeFileSectionFunc (Gtk.IconThemeFile df, string name);" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Delegate for handling a section of an icon theme file.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
-  <Interfaces>
-    <Interface>
-      <InterfaceName>System.ICloneable</InterfaceName>
-    </Interface>
-    <Interface>
-      <InterfaceName>System.Runtime.Serialization.ISerializable</InterfaceName>
-    </Interface>
-  </Interfaces>
-  <Attributes />
-  <Members />
-  <ReturnValue>
-    <ReturnType>System.Void</ReturnType>
-  </ReturnValue>
-  <Parameters>
-    <Parameter Name="df" Type="Gtk.IconThemeFile" />
-    <Parameter Name="name" Type="System.String" />
-  </Parameters>
-</Type>
diff --git a/doc/en/Vte/CharAttributes.xml b/doc/en/Vte/CharAttributes.xml
index 0a5856718..260c919c8 100644
--- a/doc/en/Vte/CharAttributes.xml
+++ b/doc/en/Vte/CharAttributes.xml
@@ -32,32 +32,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Row">
-      <MemberSignature Language="C#" Value="public long Row;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Column">
-      <MemberSignature Language="C#" Value="public long Column;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Fore">
       <MemberSignature Language="C#" Value="public Gdk.Color Fore;" />
       <MemberType>Field</MemberType>
@@ -100,5 +74,31 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Row">
+      <MemberSignature Language="C#" Value="public long Row { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Column">
+      <MemberSignature Language="C#" Value="public long Column { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Vte/Ring.xml b/doc/en/Vte/Ring.xml
index 06d7b1112..92e1dd20f 100644
--- a/doc/en/Vte/Ring.xml
+++ b/doc/en/Vte/Ring.xml
@@ -32,45 +32,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Delta">
-      <MemberSignature Language="C#" Value="public long Delta;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</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 long Length;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Max">
-      <MemberSignature Language="C#" Value="public long Max;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Vte.Ring New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -87,5 +48,44 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Delta">
+      <MemberSignature Language="C#" Value="public long Delta { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Length">
+      <MemberSignature Language="C#" Value="public long Length { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Max">
+      <MemberSignature Language="C#" Value="public long Max { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int64</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Int64" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/generator/Field.cs b/generator/Field.cs
index 3663ed113..3f12c7565 100644
--- a/generator/Field.cs
+++ b/generator/Field.cs
@@ -165,6 +165,8 @@ namespace GtkSharp.Generation {
 
 			string wrapped = table.GetCSType (CType);
 			string wrapped_name = SymbolTable.Table.MangleName (elem.GetAttribute ("cname"));
+			IGeneratable gen = table [CType];
+
 			if (IsArray) {
 				sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, StudlyName);
 			} else if (IsPadding) {
@@ -175,6 +177,16 @@ namespace GtkSharp.Generation {
 			} else if (table.IsCallback (CType)) {
 				// FIXME
 				sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
+			} else if (gen is LPGen || gen is LPUGen) {
+				sw.WriteLine ("\t\tprivate " + gen.MarshalType + " " + Name + ";");
+				sw.WriteLine ("\t\tpublic " + CSType + " " + StudlyName + " {");
+				sw.WriteLine ("\t\t\tget {");
+				sw.WriteLine ("\t\t\t\treturn " + gen.FromNative (Name) + ";");
+				sw.WriteLine ("\t\t\t}");
+				sw.WriteLine ("\t\t\tset {");
+				sw.WriteLine ("\t\t\t\t" + Name + " = " + gen.CallByName ("value") + ";");
+				sw.WriteLine ("\t\t\t}");
+				sw.WriteLine ("\t\t}");
 			} else if (table.IsObject (CType) || table.IsOpaque (CType)) {
 				sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
 
diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index 15659e3be..5e1c58df2 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -173,11 +173,6 @@
       <member cname="GTK_ICON_THEME_NOT_FOUND" name="NotFound"/>
       <member cname="GTK_ICON_THEME_FAILED" name="Failed"/>
     </enum>
-    <enum name="IconThemeFileParseError" cname="GtkIconThemeFileParseError" type="enum">
-      <member cname="GTK_ICON_THEME_FILE_PARSE_ERROR_INVALID_SYNTAX" name="Syntax"/>
-      <member cname="GTK_ICON_THEME_FILE_PARSE_ERROR_INVALID_ESCAPES" name="Escapes"/>
-      <member cname="GTK_ICON_THEME_FILE_PARSE_ERROR_INVALID_CHARS" name="Chars"/>
-    </enum>
     <enum name="ImageType" cname="GtkImageType" type="enum">
       <member cname="GTK_IMAGE_EMPTY" name="Empty"/>
       <member cname="GTK_IMAGE_PIXMAP" name="Pixmap"/>
@@ -718,24 +713,6 @@
         <parameter type="gpointer" name="data"/>
       </parameters>
     </callback>
-    <callback name="IconThemeFileLineFunc" cname="GtkIconThemeFileLineFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter type="GtkIconThemeFile*" name="df"/>
-        <parameter type="const-char*" name="key"/>
-        <parameter type="const-char*" name="locale"/>
-        <parameter type="const-char*" name="value"/>
-        <parameter type="gpointer" name="data"/>
-      </parameters>
-    </callback>
-    <callback name="IconThemeFileSectionFunc" cname="GtkIconThemeFileSectionFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter type="GtkIconThemeFile*" name="df"/>
-        <parameter type="const-char*" name="name"/>
-        <parameter type="gpointer" name="data"/>
-      </parameters>
-    </callback>
     <callback name="ItemFactoryCallback" cname="GtkItemFactoryCallback">
       <return-type type="void"/>
     </callback>
@@ -15182,7 +15159,6 @@
         </parameters>
       </method>
     </boxed>
-    <struct name="IconThemeFile" cname="GtkIconThemeFile" opaque="true"/>
     <struct name="ImageAnimationData" cname="GtkImageAnimationData">
       <field name="Anim" cname="anim" type="GdkPixbufAnimation*"/>
       <field name="Iter" cname="iter" type="GdkPixbufAnimationIter*"/>
diff --git a/sources/gtk-sharp-sources.xml b/sources/gtk-sharp-sources.xml
index 5b94aea2f..047cc7c10 100644
--- a/sources/gtk-sharp-sources.xml
+++ b/sources/gtk-sharp-sources.xml
@@ -57,6 +57,7 @@
         <exclude>gtk+-2.4.1/gtk/gtkfilesystemwin32.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkiconcache.c</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkiconcache.h</exclude>
+        <exclude>gtk+-2.4.1/gtk/gtkiconthemeparser.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkpathbar.c</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkpathbar.h</exclude>
         <exclude>gtk+-2.4.1/gtk/gtkrbtree.c</exclude>