diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 7c47b405ce..2a64ad9c58 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -2,170 +2,202 @@
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<para role="gallery">
-  <link linkend="GtkAccelLabel">
-    <inlinegraphic fileref="accel-label.png" format="PNG"></inlinegraphic>
-  </link> 
-  <link linkend="GtkButton">
-    <inlinegraphic fileref="button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkCheckButton">
-    <inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkColorButton">
-    <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkComboBox">
-    <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkComboBoxText">
-    <inlinegraphic fileref="combo-box-text.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkEntry">
-    <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkSearchEntry">
-    <inlinegraphic fileref="search-entry.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFileChooserButton">
-    <inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFontButton">
-    <inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkAppChooserButton">
-    <inlinegraphic fileref="appchooserbutton.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFrame">
-    <inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkIconView">
-    <inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkImage">
-    <inlinegraphic fileref="image.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkSpinner">
-    <inlinegraphic fileref="spinner.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkLabel">
-    <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkLevelBar">
-    <inlinegraphic fileref="levelbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkLinkButton">
-    <inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkLockButton">
-    <inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkMenuButton">
-    <inlinegraphic fileref="menu-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkMenuBar">
-    <inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkNotebook">
-    <inlinegraphic fileref="notebook.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkPaned">
-    <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
-  </link> 
-  <link linkend="GtkVolumeButton">
-    <inlinegraphic fileref="volumebutton.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkPageSetupUnixDialog">
-    <inlinegraphic fileref="pagesetupdialog.png" format="PNG"></inlinegraphic>
-  </link> 
-  <link linkend="GtkPrintUnixDialog">
-    <inlinegraphic fileref="printdialog.png" format="PNG"></inlinegraphic>
-  </link> 
-  <link linkend="GtkProgressBar">
-    <inlinegraphic fileref="progressbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkRadioButton">
-    <inlinegraphic fileref="radio-group.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkRecentChooserDialog">
-    <inlinegraphic fileref="recentchooserdialog.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkScale">
-    <inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkScrolledWindow">
-    <inlinegraphic fileref="scrolledwindow.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkSeparator">
-    <inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkSpinButton">
-    <inlinegraphic fileref="spinbutton.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkStatusbar">
-    <inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkTextView">
-    <inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkToggleButton">
-    <inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkToolbar">
-    <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkToolPalette">
-    <inlinegraphic fileref="toolpalette.png" format="PNG"></inlinegraphic>
-  </link> 
-  <link linkend="GtkTreeView">
-    <inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkWindow">
-    <inlinegraphic fileref="window.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkMessageDialog">
-    <inlinegraphic fileref="messagedialog.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkAssistant">
-    <inlinegraphic fileref="assistant.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFileChooserDialog">
-    <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkAppChooserDialog">
-    <inlinegraphic fileref="appchooserdialog.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkSwitch">
-    <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkColorChooserDialog">
-    <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkFontChooserDialog">
-    <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkAboutDialog">
-    <inlinegraphic fileref="aboutdialog.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkInfoBar">
-    <inlinegraphic fileref="info-bar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkScrollbar">
-    <inlinegraphic fileref="scrollbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkHeaderBar">
-    <inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkPlacesSidebar">
-    <inlinegraphic fileref="placessidebar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkStack">
-    <inlinegraphic fileref="stack.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkStackSwitcher">
-    <inlinegraphic fileref="stackswitcher.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkListBox">
-    <inlinegraphic fileref="list-box.png" format="PNG"></inlinegraphic>
-  </link>
+<para>
+<section id="visual-display">
+  <title>Display</title>
+  <para role="gallery">
+    <link linkend="GtkLabel">
+      <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkAccelLabel">
+      <inlinegraphic fileref="accel-label.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkSpinner">
+      <inlinegraphic fileref="spinner.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkStatusbar">
+      <inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkLevelBar">
+      <inlinegraphic fileref="levelbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkProgressBar">
+      <inlinegraphic fileref="progressbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkInfoBar">
+      <inlinegraphic fileref="info-bar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkScrollbar">
+      <inlinegraphic fileref="scrollbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkImage">
+      <inlinegraphic fileref="image.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkSeparator">
+      <inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkTextView">
+      <inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkScale">
+      <inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
+    </link>
+  </para>
+</section>
+
+<section id="visual-buttons">
+  <title>Buttons</title>
+  <para role="gallery">
+    <link linkend="GtkButton">
+      <inlinegraphic fileref="button.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkCheckButton">
+      <inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkToggleButton">
+      <inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkLinkButton">
+      <inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic>
+    </link>
+
+    <link linkend="GtkMenuButton">
+      <inlinegraphic fileref="menu-button.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkLockButton">
+      <inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkSpinButton">
+      <inlinegraphic fileref="spinbutton.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkColorButton">
+      <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic>
+    </link>
+
+    <link linkend="GtkSwitch">
+      <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkComboBox">
+      <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkComboBoxText">
+      <inlinegraphic fileref="combo-box-text.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkFontButton">
+      <inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic>
+    </link>
+
+    <link linkend="GtkAppChooserButton">
+      <inlinegraphic fileref="appchooserbutton.png" format="PNG"></inlinegraphic>
+    </link>
+   <link linkend="GtkVolumeButton">
+      <inlinegraphic fileref="volumebutton.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkRadioButton">
+      <inlinegraphic fileref="radio-group.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkFileChooserButton">
+      <inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
+    </link>
+  </para>
+</section>
+
+<section id="visual-entries">
+  <title>Entries</title>
+  <para role="gallery">
+    <link linkend="GtkEntry">
+      <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkSearchEntry">
+      <inlinegraphic fileref="search-entry.png" format="PNG"></inlinegraphic>
+    </link>
+  </para>
+</section>
+
+<section id="visual-containers">
+  <title>Containers</title>
+  <para role="gallery">
+    <link linkend="GtkScrolledWindow">
+      <inlinegraphic fileref="scrolledwindow.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkHeaderBar">
+      <inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkListBox">
+      <inlinegraphic fileref="list-box.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkStack">
+      <inlinegraphic fileref="stack.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkStackSwitcher">
+      <inlinegraphic fileref="stackswitcher.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkTreeView">
+      <inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkIconView">
+      <inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkNotebook">
+      <inlinegraphic fileref="notebook.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkFrame">
+      <inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkPaned">
+      <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkMenuBar">
+      <inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkToolbar">
+      <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkToolPalette">
+      <inlinegraphic fileref="toolpalette.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkPlacesSidebar">
+      <inlinegraphic fileref="placessidebar.png" format="PNG"></inlinegraphic>
+    </link>
+  </para>
+</section>
+
+<section id="visual-windows">
+  <title>Windows</title>
+  <para role="gallery">
+    <link linkend="GtkWindow">
+      <inlinegraphic fileref="window.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkMessageDialog">
+      <inlinegraphic fileref="messagedialog.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkAboutDialog">
+      <inlinegraphic fileref="aboutdialog.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkAssistant">
+      <inlinegraphic fileref="assistant.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkColorChooserDialog">
+      <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkFileChooserDialog">
+      <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkRecentChooserDialog">
+      <inlinegraphic fileref="recentchooserdialog.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkFontChooserDialog">
+      <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkAppChooserDialog">
+      <inlinegraphic fileref="appchooserdialog.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkPageSetupUnixDialog">
+      <inlinegraphic fileref="pagesetupdialog.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkPrintUnixDialog">
+      <inlinegraphic fileref="printdialog.png" format="PNG"></inlinegraphic>
+    </link>
+  </para>
+</section>
 </para>