diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index 50f09618cd..0fefae3fdb 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,3 +1,29 @@
+2002-05-13  Sven Neumann  <sven@gimp.org>
+
+	* libgimpwidgets/libgimpwidgets-docs.sgml: added GimpStock section,
+	removed GimpWidgetTypes.
+
+	* libgimpwidgets/libgimpwidgets-sections.txt: updated.
+
+	* libgimpwidgets/tmpl/gimpstock.sgml: added GimpStock templates.
+
+	* libgimpwidgets/tmpl/gimpwidgetstypes.sgml: removed.
+
+	* libgimpwidgets/tmpl/gimpbutton.sgml
+	* libgimpwidgets/tmpl/gimpchainbutton.sgml
+	* libgimpwidgets/tmpl/gimpcolorarea.sgml
+	* libgimpwidgets/tmpl/gimpcolorbutton.sgml
+	* libgimpwidgets/tmpl/gimpdialog.sgml
+	* libgimpwidgets/tmpl/gimpfileselection.sgml
+	* libgimpwidgets/tmpl/gimphelpui.sgml
+	* libgimpwidgets/tmpl/gimpoffsetarea.sgml
+	* libgimpwidgets/tmpl/gimppatheditor.sgml
+	* libgimpwidgets/tmpl/gimppixmap.sgml
+	* libgimpwidgets/tmpl/gimpquerybox.sgml
+	* libgimpwidgets/tmpl/gimpsizeentry.sgml
+	* libgimpwidgets/tmpl/gimpunitmenu.sgml
+	* libgimpwidgets/tmpl/gimpwidgets.sgml: updated.
+
 2002-05-03  Sven Neumann  <sven@gimp.org>
 
 	* includes.txt: fixed typo.
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
index b60b6d46da..72a8cd0abc 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
@@ -1,5 +1,4 @@
 <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-<!entity libgimpwidgets-gimpwidgetstypes SYSTEM "sgml/gimpwidgetstypes.sgml">
 <!entity GimpChainButton SYSTEM "sgml/gimpchainbutton.sgml">
 <!entity GimpColorButton SYSTEM "sgml/gimpcolorbutton.sgml">
 <!entity GimpFileSelection SYSTEM "sgml/gimpfileselection.sgml">
@@ -7,10 +6,11 @@
 <!entity GimpPixmap SYSTEM "sgml/gimppixmap.sgml">
 <!entity GimpSizeEntry SYSTEM "sgml/gimpsizeentry.sgml">
 <!entity GimpUnitMenu SYSTEM "sgml/gimpunitmenu.sgml">
-<!entity libgimpwidgets-gimpdialog SYSTEM "sgml/gimpdialog.sgml">
-<!entity libgimpwidgets-gimphelpui SYSTEM "sgml/gimphelpui.sgml">
-<!entity libgimpwidgets-gimpquerybox SYSTEM "sgml/gimpquerybox.sgml">
-<!entity libgimpwidgets-gimpwidgets SYSTEM "sgml/gimpwidgets.sgml">
+<!entity GimpDialog SYSTEM "sgml/gimpdialog.sgml">
+<!entity GimpHelpUI SYSTEM "sgml/gimphelpui.sgml">
+<!entity GimpQueryBox SYSTEM "sgml/gimpquerybox.sgml">
+<!entity GimpStock SYSTEM "sgml/gimpstock.sgml">
+<!entity GimpWidgets SYSTEM "sgml/gimpwidgets.sgml">
 ]>
 <book id="index">
   <bookinfo>
@@ -19,7 +19,6 @@
 
   <chapter id="libgimpwidgets">
     <title>GIMP Widgets Library</title>
-    &libgimpwidgets-gimpwidgetstypes;
     &GimpChainButton;
     &GimpColorButton; 
     &GimpFileSelection;
@@ -27,9 +26,10 @@
     &GimpPixmap;
     &GimpSizeEntry;
     &GimpUnitMenu;
-    &libgimpwidgets-gimpdialog;
-    &libgimpwidgets-gimphelpui;
-    &libgimpwidgets-gimpquerybox;
-    &libgimpwidgets-gimpwidgets;
+    &GimpDialog;
+    &GimpHelpUI;
+    &GimpQueryBox;
+    &GimpWidgets;
+    &GimpStock;
   </chapter>
 </book>
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
index bd52acd3dc..0db69d2848 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
@@ -1,7 +1,7 @@
 <SECTION>
 <FILE>gimpchainbutton</FILE>
+GimpChainButton
 GimpChainPosition
-<TITLE>GimpChainButton</TITLE>
 gimp_chain_button_new
 gimp_chain_button_set_active
 gimp_chain_button_get_active
@@ -10,14 +10,16 @@ GIMP_CHAIN_BUTTON
 GIMP_IS_CHAIN_BUTTON
 GIMP_TYPE_CHAIN_BUTTON
 gimp_chain_button_get_type
+GimpChainButtonClass
 GIMP_CHAIN_BUTTON_CLASS
 GIMP_IS_CHAIN_BUTTON_CLASS
+GIMP_CHAIN_BUTTON_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpcolorarea</FILE>
+GimpColorArea
 GimpColorAreaType
-<TITLE>GimpColorArea</TITLE>
 gimp_color_area_new
 gimp_color_area_set_color
 gimp_color_area_get_color
@@ -28,13 +30,15 @@ GIMP_COLOR_AREA
 GIMP_IS_COLOR_AREA
 GIMP_TYPE_COLOR_AREA
 gimp_color_area_get_type
+GimpColorAreaClass
 GIMP_COLOR_AREA_CLASS
 GIMP_IS_COLOR_AREA_CLASS
+GIMP_COLOR_AREA_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpcolorbutton</FILE>
-<TITLE>GimpColorButton</TITLE>
+GimpColorButton
 gimp_color_button_new
 gimp_color_button_set_color
 gimp_color_button_get_color
@@ -45,13 +49,15 @@ GIMP_COLOR_BUTTON
 GIMP_IS_COLOR_BUTTON
 GIMP_TYPE_COLOR_BUTTON
 gimp_color_button_get_type
+GimpColorButtonClass
 GIMP_COLOR_BUTTON_CLASS
 GIMP_IS_COLOR_BUTTON_CLASS
+GIMP_COLOR_BUTTON_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpfileselection</FILE>
-<TITLE>GimpFileSelection</TITLE>
+GimpFileSelection
 gimp_file_selection_new
 gimp_file_selection_get_filename
 gimp_file_selection_set_filename
@@ -60,13 +66,15 @@ GIMP_FILE_SELECTION
 GIMP_IS_FILE_SELECTION
 GIMP_TYPE_FILE_SELECTION
 gimp_file_selection_get_type
+GimpFileSelectionClass
 GIMP_FILE_SELECTION_CLASS
 GIMP_IS_FILE_SELECTION_CLASS
+GIMP_FILE_SELECTION_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimppatheditor</FILE>
-<TITLE>GimpPathEditor</TITLE>
+GimpPathEditor
 gimp_path_editor_new
 gimp_path_editor_get_path
 <SUBSECTION Standard>
@@ -74,13 +82,15 @@ GIMP_PATH_EDITOR
 GIMP_IS_PATH_EDITOR
 GIMP_TYPE_PATH_EDITOR
 gimp_path_editor_get_type
+GimpPathEditorClass
 GIMP_PATH_EDITOR_CLASS
 GIMP_IS_PATH_EDITOR_CLASS
+GIMP_PATH_EDITOR_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimppixmap</FILE>
-<TITLE>GimpPixmap</TITLE>
+GimpPixmap
 gimp_pixmap_new
 gimp_pixmap_set
 <SUBSECTION Standard>
@@ -88,14 +98,17 @@ GIMP_PIXMAP
 GIMP_IS_PIXMAP
 GIMP_TYPE_PIXMAP
 gimp_pixmap_get_type
+GimpPixmapClass
 GIMP_PIXMAP_CLASS
 GIMP_IS_PIXMAP_CLASS
+GIMP_PIXMAP_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpsizeentry</FILE>
+GimpSizeEntry
 GimpSizeEntryField
-<TITLE>GimpSizeEntry</TITLE>
+GimpSizeEntryUpdatePolicy
 gimp_size_entry_new
 gimp_size_entry_add_field
 gimp_size_entry_attach_label
@@ -116,13 +129,15 @@ GIMP_SIZE_ENTRY
 GIMP_IS_SIZE_ENTRY
 GIMP_TYPE_SIZE_ENTRY
 gimp_size_entry_get_type
+GimpSizeEntryClass
 GIMP_SIZE_ENTRY_CLASS
 GIMP_IS_SIZE_ENTRY_CLASS
+GIMP_SIZE_ENTRY_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpunitmenu</FILE>
-<TITLE>GimpUnitMenu</TITLE>
+GimpUnitMenu
 gimp_unit_menu_new
 gimp_unit_menu_set_unit
 gimp_unit_menu_get_unit
@@ -131,26 +146,31 @@ GIMP_UNIT_MENU
 GIMP_IS_UNIT_MENU
 GIMP_TYPE_UNIT_MENU
 gimp_unit_menu_get_type
+GimpUnitMenuClass
 GIMP_UNIT_MENU_CLASS
 GIMP_IS_UNIT_MENU_CLASS
+GIMP_UNIT_MENU_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpbutton</FILE>
-<TITLE>GimpButton</TITLE>
+GimpButton
 gimp_button_new
+gimp_button_extended_clicked
 <SUBSECTION Standard>
 GIMP_BUTTON
 GIMP_IS_BUTTON
 GIMP_TYPE_BUTTON
 gimp_button_get_type
+GimpButtonClass
 GIMP_BUTTON_CLASS
 GIMP_IS_BUTTON_CLASS
+GIMP_BUTTON_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpoffsetarea</FILE>
-<TITLE>GimpOffsetArea</TITLE>
+GimpOffsetArea
 gimp_offset_area_new
 gimp_offset_area_set_size
 gimp_offset_area_set_offsets
@@ -159,27 +179,39 @@ GIMP_OFFSET_AREA
 GIMP_IS_OFFSET_AREA
 GIMP_TYPE_OFFSET_AREA
 gimp_offset_area_get_type
+GimpOffsetAreaClass
 GIMP_OFFSET_AREA_CLASS
 GIMP_IS_OFFSET_AREA_CLASS
+GIMP_OFFSET_AREA_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimpdialog</FILE>
+GimpDialog
 gimp_dialog_new
 gimp_dialog_newv
-gimp_dialog_set_icon
 gimp_dialog_create_action_area
 gimp_dialog_create_action_areav
+<SUBSECTION Standard>
+GIMP_TYPE_DIALOG
+GIMP_DIALOG
+GIMP_IS_DIALOG
+gimp_dialog_get_type
+GimpDialogClass
+GIMP_DIALOG_CLASS
+GIMP_IS_DIALOG_CLASS
+GIMP_DIALOG_GET_CLASS
 </SECTION>
 
 <SECTION>
 <FILE>gimphelpui</FILE>
+GimpHelpFunc
 gimp_help_init
 gimp_help_free
 gimp_help_enable_tooltips
 gimp_help_disable_tooltips
 gimp_standard_help_func
-gimp_help_connect_help_accel
+gimp_help_connect
 gimp_help_set_help_data
 gimp_context_help
 </SECTION>
@@ -196,15 +228,100 @@ gimp_query_int_box
 gimp_query_double_box
 gimp_query_size_box
 gimp_query_boolean_box
+GIMP_QUERY_BOX_VBOX
+</SECTION>
+
+<SECTION>
+<FILE>gimpstock</FILE>
+gimp_stock_init
+GIMP_STOCK_ANCHOR
+GIMP_STOCK_DUPLICATE
+GIMP_STOCK_EDIT
+GIMP_STOCK_LINKED
+GIMP_STOCK_PASTE_AS_NEW
+GIMP_STOCK_PASTE_INTO
+GIMP_STOCK_RESET
+GIMP_STOCK_VISIBLE
+GIMP_STOCK_HCHAIN
+GIMP_STOCK_HCHAIN_BROKEN
+GIMP_STOCK_VCHAIN
+GIMP_STOCK_VCHAIN_BROKEN
+GIMP_STOCK_SELECTION_REPLACE
+GIMP_STOCK_SELECTION_ADD
+GIMP_STOCK_SELECTION_SUBTRACT
+GIMP_STOCK_SELECTION_INTERSECT
+GIMP_STOCK_SELECTION_STROKE
+GIMP_STOCK_SELECTION_TO_PATH
+GIMP_STOCK_PATH_STROKE
+GIMP_STOCK_CONVERT_RGB
+GIMP_STOCK_CONVERT_GRAYSCALE
+GIMP_STOCK_CONVERT_INDEXED
+GIMP_STOCK_MERGE_DOWN
+GIMP_STOCK_RESHOW_FILTER
+GIMP_STOCK_ROTATE_90
+GIMP_STOCK_ROTATE_180
+GIMP_STOCK_ROTATE_270
+GIMP_STOCK_RESIZE
+GIMP_STOCK_SCALE
+GIMP_STOCK_SELECTION_TO_CHANNEL
+GIMP_STOCK_NAVIGATION
+GIMP_STOCK_QMASK_OFF
+GIMP_STOCK_QMASK_ON
+GIMP_STOCK_INFO
+GIMP_STOCK_WARNING
+GIMP_STOCK_WILBER
+GIMP_STOCK_TOOL_AIRBRUSH
+GIMP_STOCK_TOOL_BEZIER_SELECT
+GIMP_STOCK_TOOL_BLEND
+GIMP_STOCK_TOOL_BLUR
+GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST
+GIMP_STOCK_TOOL_BUCKET_FILL
+GIMP_STOCK_TOOL_BY_COLOR_SELECT
+GIMP_STOCK_TOOL_CLONE
+GIMP_STOCK_TOOL_COLOR_BALANCE
+GIMP_STOCK_TOOL_COLOR_PICKER
+GIMP_STOCK_TOOL_CROP
+GIMP_STOCK_TOOL_CURVES
+GIMP_STOCK_TOOL_DODGE
+GIMP_STOCK_TOOL_ELLIPSE_SELECT
+GIMP_STOCK_TOOL_ERASER
+GIMP_STOCK_TOOL_FLIP
+GIMP_STOCK_TOOL_FREE_SELECT
+GIMP_STOCK_TOOL_FUZZY_SELECT
+GIMP_STOCK_TOOL_HISTOGRAM
+GIMP_STOCK_TOOL_HUE_SATURATION
+GIMP_STOCK_TOOL_INK
+GIMP_STOCK_TOOL_ISCISSORS
+GIMP_STOCK_TOOL_LEVELS
+GIMP_STOCK_TOOL_MEASURE
+GIMP_STOCK_TOOL_MOVE
+GIMP_STOCK_TOOL_PAINTBRUSH
+GIMP_STOCK_TOOL_PATH
+GIMP_STOCK_TOOL_PENCIL
+GIMP_STOCK_TOOL_PERSPECTIVE
+GIMP_STOCK_TOOL_POSTERIZE
+GIMP_STOCK_TOOL_RECT_SELECT
+GIMP_STOCK_TOOL_ROTATE
+GIMP_STOCK_TOOL_SCALE
+GIMP_STOCK_TOOL_SHEAR
+GIMP_STOCK_TOOL_SMUDGE
+GIMP_STOCK_TOOL_TEXT
+GIMP_STOCK_TOOL_THRESHOLD
+GIMP_STOCK_TOOL_ZOOM
+GIMP_STOCK_WILBER_EEK
 </SECTION>
 
 <SECTION>
 <FILE>gimpwidgets</FILE>
+gimp_widgets_init
 gimp_option_menu_new
 gimp_option_menu_new2
 gimp_option_menu_set_history
+gimp_option_menu_set_sensitive
+GimpOptionMenuSensitivityCallback
 gimp_radio_group_new
 gimp_radio_group_new2
+gimp_radio_group_set_active
 gimp_spin_button_new
 GIMP_SCALE_ENTRY_LABEL
 GIMP_SCALE_ENTRY_SCALE
@@ -234,20 +351,3 @@ gimp_double_adjustment_update
 gimp_unit_menu_update
 gimp_table_attach_aligned
 </SECTION>
-
-<SECTION>
-<FILE>gimpwidgetstypes</FILE>
-GimpSizeEntryUpdatePolicy
-GimpButton
-GimpChainButton
-GimpColorArea
-GimpColorButton
-GimpFileSelection
-GimpOffsetArea
-GimpPathEditor
-GimpPixmap
-GimpSizeEntry
-GimpUnitMenu
-GimpHelpFunc
-</SECTION>
-
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpbutton.sgml b/devel-docs/libgimpwidgets/tmpl/gimpbutton.sgml
index e7355b6e99..361743f156 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpbutton.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpbutton.sgml
@@ -14,6 +14,12 @@ GimpButton
 
 </para>
 
+<!-- ##### STRUCT GimpButton ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_button_new ##### -->
 <para>
 
@@ -22,3 +28,12 @@ GimpButton
 @Returns: 
 
 
+<!-- ##### FUNCTION gimp_button_extended_clicked ##### -->
+<para>
+
+</para>
+
+@button: 
+@state: 
+
+
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpchainbutton.sgml b/devel-docs/libgimpwidgets/tmpl/gimpchainbutton.sgml
index 55b90b168b..f37e2e5383 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpchainbutton.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpchainbutton.sgml
@@ -26,6 +26,12 @@ You may want to use the convenience function gimp_coordinates_new() to set
 up two GimpSizeEntries (see #GimpSizeEntry) linked with a #GimpChainButton.
 </para>
 
+<!-- ##### STRUCT GimpChainButton ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM GimpChainPosition ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpcolorarea.sgml b/devel-docs/libgimpwidgets/tmpl/gimpcolorarea.sgml
index 652fb41aa8..c789a0da40 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpcolorarea.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpcolorarea.sgml
@@ -14,6 +14,13 @@ GimpColorArea
 
 </para>
 
+<!-- ##### STRUCT GimpColorArea ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+
 <!-- ##### ENUM GimpColorAreaType ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpcolorbutton.sgml b/devel-docs/libgimpwidgets/tmpl/gimpcolorbutton.sgml
index 7506f98be6..a8abfc7cc6 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpcolorbutton.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpcolorbutton.sgml
@@ -21,6 +21,12 @@ color, the "color_changed" signal is emitted.
 #libgimpcolor-gimpcolorspace
 </para>
 
+<!-- ##### STRUCT GimpColorButton ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_color_button_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
index 85e71123eb..98c6d48d44 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
@@ -15,6 +15,13 @@ dialog-related stuff.
 
 </para>
 
+<!-- ##### STRUCT GimpDialog ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+
 <!-- ##### FUNCTION gimp_dialog_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpfileselection.sgml b/devel-docs/libgimpwidgets/tmpl/gimpfileselection.sgml
index 5fb7ea060b..49529432b4 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpfileselection.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpfileselection.sgml
@@ -31,6 +31,12 @@ will be emitted.
 #GimpPathEditor
 </para>
 
+<!-- ##### STRUCT GimpFileSelection ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_file_selection_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimphelpui.sgml b/devel-docs/libgimpwidgets/tmpl/gimphelpui.sgml
index 58a5097880..6a372477bb 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimphelpui.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimphelpui.sgml
@@ -15,6 +15,36 @@ system.
 
 </para>
 
+<!-- ##### USER_FUNCTION GimpHelpFunc ##### -->
+<para>
+This is the prototype for all functions you pass as @help_func to the
+various GIMP dialog constructors like gimp_dialog_new(),
+gimp_query_int_box() etc.
+</para>
+
+<para>
+Note that all help paths are relative to the root of the help system
+in the current language. So if your language is "C", a help path of
+"filters/foo_bar.html" will expand to
+"${gimp_data_dir}/help/C/filters/foo_bar.html".
+</para>
+
+<para>
+All these functions finally call gimp_help_connect_help_accel() which
+does the work of installing the "F1" accelerator.
+</para>
+
+<para>
+In most cases it will be ok to use gimp_plugin_help_func() which does
+nothing but passing the @help_data string to gimp_help(). If your
+plug-in needs some more sophisticated help handling you can provide
+your own @help_func which has to call gimp_help() to actually display
+the help.
+</para>
+
+@help_data: A string containing the path to a HTML page.
+
+
 <!-- ##### FUNCTION gimp_help_init ##### -->
 <para>
 
@@ -63,6 +93,16 @@ See #GimpHelpFunc for the naming conventions of HTML help files.
 @help_data: A string containing the path to a HTML page.
 
 
+<!-- ##### FUNCTION gimp_help_connect ##### -->
+<para>
+
+</para>
+
+@widget: 
+@help_func: 
+@help_data: 
+
+
 <!-- ##### FUNCTION gimp_help_set_help_data ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpoffsetarea.sgml b/devel-docs/libgimpwidgets/tmpl/gimpoffsetarea.sgml
index ed09a6c4ba..5c9e90f4ea 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpoffsetarea.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpoffsetarea.sgml
@@ -14,6 +14,21 @@ GimpOffsetArea
 
 </para>
 
+<!-- ##### STRUCT GimpOffsetArea ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+@orig_width: 
+@orig_height: 
+@width: 
+@height: 
+@offset_x: 
+@offset_y: 
+@display_ratio_x: 
+@display_ratio_y: 
+
 <!-- ##### FUNCTION gimp_offset_area_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimppatheditor.sgml b/devel-docs/libgimpwidgets/tmpl/gimppatheditor.sgml
index 009d769bde..4f7cf866ad 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimppatheditor.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimppatheditor.sgml
@@ -30,6 +30,12 @@ the search path, the "path_changed" signal will be emitted.
 #G_SEARCHPATH_SEPARATOR
 </para>
 
+<!-- ##### STRUCT GimpPathEditor ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_path_editor_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimppixmap.sgml b/devel-docs/libgimpwidgets/tmpl/gimppixmap.sgml
index 516010cd87..da9aa40467 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimppixmap.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimppixmap.sgml
@@ -26,6 +26,12 @@ gimp_pixmap_button_new()
 #GtkPixmap
 </para>
 
+<!-- ##### STRUCT GimpPixmap ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_pixmap_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpquerybox.sgml b/devel-docs/libgimpwidgets/tmpl/gimpquerybox.sgml
index 03ac06cf6a..3fac544f70 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpquerybox.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpquerybox.sgml
@@ -179,3 +179,11 @@ Note that you have to g_free() the returned string.
 @eek: 
 
 
+<!-- ##### MACRO GIMP_QUERY_BOX_VBOX ##### -->
+<para>
+
+</para>
+
+@qbox: 
+
+
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpsizeentry.sgml b/devel-docs/libgimpwidgets/tmpl/gimpsizeentry.sgml
index 74a46d7550..6741b3ad84 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpsizeentry.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpsizeentry.sgml
@@ -42,12 +42,27 @@ real-world-unit.
 gimp_coordinates_new()
 </para>
 
+<!-- ##### STRUCT GimpSizeEntry ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GimpSizeEntryField ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ENUM GimpSizeEntryUpdatePolicy ##### -->
+<para>
+
+</para>
+
+@GIMP_SIZE_ENTRY_UPDATE_NONE: 
+@GIMP_SIZE_ENTRY_UPDATE_SIZE: 
+@GIMP_SIZE_ENTRY_UPDATE_RESOLUTION: 
+
 <!-- ##### FUNCTION gimp_size_entry_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml
new file mode 100644
index 0000000000..918b3fc345
--- /dev/null
+++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml
@@ -0,0 +1,548 @@
+<!-- ##### SECTION Title ##### -->
+gimpstock
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gimp_stock_init ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_ANCHOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_DUPLICATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_EDIT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_LINKED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_PASTE_AS_NEW ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_PASTE_INTO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_RESET ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_VISIBLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_HCHAIN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_HCHAIN_BROKEN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_VCHAIN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_VCHAIN_BROKEN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_REPLACE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_ADD ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_SUBTRACT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_INTERSECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_STROKE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_TO_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_PATH_STROKE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_CONVERT_RGB ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_CONVERT_GRAYSCALE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_CONVERT_INDEXED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_MERGE_DOWN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_RESHOW_FILTER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_ROTATE_90 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_ROTATE_180 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_ROTATE_270 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_RESIZE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SCALE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_SELECTION_TO_CHANNEL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_NAVIGATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_QMASK_OFF ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_QMASK_ON ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_INFO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_WARNING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_WILBER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_AIRBRUSH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BEZIER_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BLEND ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BLUR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BUCKET_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_BY_COLOR_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_CLONE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_COLOR_BALANCE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_COLOR_PICKER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_CROP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_CURVES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_DODGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_ELLIPSE_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_ERASER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_FLIP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_FREE_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_FUZZY_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_HISTOGRAM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_HUE_SATURATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_INK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_ISCISSORS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_LEVELS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_MEASURE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_MOVE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_PAINTBRUSH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_PENCIL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_PERSPECTIVE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_POSTERIZE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_RECT_SELECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_ROTATE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_SCALE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_SHEAR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_SMUDGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_TEXT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_THRESHOLD ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_TOOL_ZOOM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GIMP_STOCK_WILBER_EEK ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml b/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
index 6c40e8f371..0f0dc51450 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
@@ -33,6 +33,12 @@ Whenever the user selects a unit from the menu or the dialog, the
 gimp_coordinates_new()
 </para>
 
+<!-- ##### STRUCT GimpUnitMenu ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gimp_unit_menu_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
index e72aa12399..3234c24a6a 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
@@ -15,6 +15,13 @@ helper functions.
 
 </para>
 
+<!-- ##### FUNCTION gimp_widgets_init ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION gimp_option_menu_new ##### -->
 <para>
 
@@ -115,6 +122,26 @@ gtk_object_set_user_data().</entry>
 @user_data: 
 
 
+<!-- ##### FUNCTION gimp_option_menu_set_sensitive ##### -->
+<para>
+
+</para>
+
+@option_menu: 
+@callback: 
+@callback_data: 
+
+
+<!-- ##### USER_FUNCTION GimpOptionMenuSensitivityCallback ##### -->
+<para>
+
+</para>
+
+@item_data: 
+@callback_data: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gimp_radio_group_new ##### -->
 <para>
 
@@ -206,6 +233,15 @@ gtk_object_set_user_data().</entry>
 @data: 
 
 
+<!-- ##### FUNCTION gimp_radio_group_set_active ##### -->
+<para>
+
+</para>
+
+@radio_button: 
+@item_data: 
+
+
 <!-- ##### FUNCTION gimp_spin_button_new ##### -->
 <para>
 
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpwidgetstypes.sgml b/devel-docs/libgimpwidgets/tmpl/gimpwidgetstypes.sgml
deleted file mode 100644
index 82f7b48ca9..0000000000
--- a/devel-docs/libgimpwidgets/tmpl/gimpwidgetstypes.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-gimpwidgetstypes
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GimpSizeEntryUpdatePolicy ##### -->
-<para>
-
-</para>
-
-@GIMP_SIZE_ENTRY_UPDATE_NONE: 
-@GIMP_SIZE_ENTRY_UPDATE_SIZE: 
-@GIMP_SIZE_ENTRY_UPDATE_RESOLUTION: 
-
-<!-- ##### STRUCT GimpButton ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpChainButton ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpColorArea ##### -->
-<para>
-
-</para>
-
-@parent_instance: 
-
-<!-- ##### STRUCT GimpColorButton ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpFileSelection ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpOffsetArea ##### -->
-<para>
-
-</para>
-
-@parent_instance: 
-@orig_width: 
-@orig_height: 
-@width: 
-@height: 
-@offset_x: 
-@offset_y: 
-@display_ratio_x: 
-@display_ratio_y: 
-
-<!-- ##### STRUCT GimpPathEditor ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpPixmap ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpSizeEntry ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GimpUnitMenu ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION GimpHelpFunc ##### -->
-<para>
-This is the prototype for all functions you pass as @help_func to the
-various GIMP dialog constructors like gimp_dialog_new(),
-gimp_query_int_box() etc.
-</para>
-
-<para>
-Note that all help paths are relative to the root of the help system
-in the current language. So if your language is "C", a help path of
-"filters/foo_bar.html" will expand to
-"${gimp_data_dir}/help/C/filters/foo_bar.html".
-</para>
-
-<para>
-All these functions finally call gimp_help_connect_help_accel() which
-does the work of installing the "F1" accelerator.
-</para>
-
-<para>
-In most cases it will be ok to use gimp_plugin_help_func() which does
-nothing but passing the @help_data string to gimp_help(). If your
-plug-in needs some more sophisticated help handling you can provide
-your own @help_func which has to call gimp_help() to actually display
-the help.
-</para>
-
-@help_data: A string containing the path to a HTML page.
-
-