diff --git a/docs/sphinx/_templates/main.html b/docs/sphinx/_templates/main.html
index 6c6d8842..203d0cc2 100644
--- a/docs/sphinx/_templates/main.html
+++ b/docs/sphinx/_templates/main.html
@@ -29,11 +29,17 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.adv.1moduleindex") }}">wx.adv</a><br/>
          <span class="linkdescr">Less commonly used or more advanced classes</span></p>
 
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.grid.1moduleindex") }}">wx.grid</a><br/>
+         <span class="linkdescr">Widget and supporting classes for displaying and editing tabular data</span></p>
+
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.dataview.1moduleindex") }}">wx.dataview</a><br/>
          <span class="linkdescr">Classes for viewing tabular or hierarchical data</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("wx.stc.1moduleindex") }}">wx.stc</a><br/>
-         <span class="linkdescr">Classes for Styled Text Control, a.k.a Scintilla</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.richtext.1moduleindex") }}">wx.richtext</a><br/>
+         <span class="linkdescr">A generic, ground-up implementation of a text control capable of showing multiple text styles and images.</span></p>
+
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.ribbon.1moduleindex") }}">wx.ribbon</a><br/>
+         <span class="linkdescr">A tabbed generic, ground-up implementation of a text control capable of showing multiple text styles and images.</span></p>
 
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.html.1moduleindex") }}">wx.html</a><br/>
          <span class="linkdescr">Widget and supporting classes for a generic html renderer</span></p>
@@ -41,12 +47,6 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.html2.1moduleindex") }}">wx.html2</a><br/>
          <span class="linkdescr">Widget and supporting classes for a native html renderer, with CSS and javascript support</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("wx.grid.1moduleindex") }}">wx.grid</a><br/>
-         <span class="linkdescr">Widget and supporting classes for displaying and editing tabular data</span></p>
-
-      <p class="biglink"><a class="biglink" href="{{ pathto("wx.richtext.1moduleindex") }}">wx.richtext</a><br/>
-         <span class="linkdescr">A generic, ground-up implementation of a text control capable of showing multiple text styles and images.</span></p>
-
 
     </td>
     <td valign="top" width="50%" style="margin-left: 5px">
@@ -56,18 +56,21 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.glcanvas.1moduleindex") }}">wx.glcanvas</a><br/>
          <span class="linkdescr">Classes for embedding OpenGL views in a window</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xrc.1moduleindex") }}">wx.xrc</a><br/>
-         <span class="linkdescr">Classes for loading widgets and layout from XML</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.stc.1moduleindex") }}">wx.stc</a><br/>
+         <span class="linkdescr">Classes for Styled Text Control, a.k.a Scintilla</span></p>
+
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.msw.1moduleindex") }}">wx.msw</a><br/>
+         <span class="linkdescr">A few classes available only on Windows</span></p>
 
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.media.1moduleindex") }}">wx.media</a><br/>
          <span class="linkdescr">MediaCtrl and related classes</span></p>
 
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xrc.1moduleindex") }}">wx.xrc</a><br/>
+         <span class="linkdescr">Classes for loading widgets and layout from XML</span></p>
+
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.xml.1moduleindex") }}">wx.xml</a><br/>
          <span class="linkdescr">Some simple XML classes for use with XRC</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("wx.msw.1moduleindex") }}">wx.msw</a><br/>
-         <span class="linkdescr">A few classes available only on Windows</span></p>
-
       <p class="biglink"><a class="biglink" href="{{ pathto("wx.py") }}">wx.py</a><br/>
          <span class="linkdescr">The py package, containing PyCrust and related modules</span></p>
 
diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index 0ed608cd..4ae02e8c 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -2548,159 +2548,159 @@
 "RE_MULTILINE":"wx.richtext.",
 "RE_READONLY":"wx.richtext.",
 "RGBValue":"wx.Image.",
-"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_ACTIVE_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_LABEL_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR":"wx.ribbon",
-"RIBBON_ART_BUTTON_BAR_LABEL_FONT":"wx.ribbon",
-"RIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE":"wx.ribbon",
-"RIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE":"wx.ribbon",
-"RIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE":"wx.ribbon",
-"RIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE":"wx.ribbon",
-"RIBBON_ART_GALLERY_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_FACE_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_GALLERY_ITEM_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BORDER_BOTTOM_SIZE":"wx.ribbon",
-"RIBBON_ART_PAGE_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_BORDER_LEFT_SIZE":"wx.ribbon",
-"RIBBON_ART_PAGE_BORDER_RIGHT_SIZE":"wx.ribbon",
-"RIBBON_ART_PAGE_BORDER_TOP_SIZE":"wx.ribbon",
-"RIBBON_ART_PAGE_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_HOVER_LABEL_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_LABEL_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_LABEL_FONT":"wx.ribbon",
-"RIBBON_ART_PANEL_MINIMISED_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_MINIMISED_BORDER_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_MINIMISED_LABEL_COLOUR":"wx.ribbon",
-"RIBBON_ART_PANEL_X_SEPARATION_SIZE":"wx.ribbon",
-"RIBBON_ART_PANEL_Y_SEPARATION_SIZE":"wx.ribbon",
-"RIBBON_ART_TAB_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_LABEL_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_LABEL_FONT":"wx.ribbon",
-"RIBBON_ART_TAB_SEPARATION_SIZE":"wx.ribbon",
-"RIBBON_ART_TAB_SEPARATOR_COLOUR":"wx.ribbon",
-"RIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOLBAR_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOLBAR_FACE_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOLBAR_HOVER_BORDER_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_GROUP_SEPARATION_SIZE":"wx.ribbon",
-"RIBBON_ART_TOOL_HOVER_BACKGROUND_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon",
-"RIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon",
-"RIBBON_BAR_ALWAYS_SHOW_TABS":"wx.ribbon",
-"RIBBON_BAR_DEFAULT_STYLE":"wx.ribbon",
-"RIBBON_BAR_EXPANDED":"wx.ribbon",
-"RIBBON_BAR_FLOW_HORIZONTAL":"wx.ribbon",
-"RIBBON_BAR_FLOW_VERTICAL":"wx.ribbon",
-"RIBBON_BAR_FOLDBAR_STYLE":"wx.ribbon",
-"RIBBON_BAR_MINIMIZED":"wx.ribbon",
-"RIBBON_BAR_PINNED":"wx.ribbon",
-"RIBBON_BAR_SHOW_HELP_BUTTON":"wx.ribbon",
-"RIBBON_BAR_SHOW_PAGE_ICONS":"wx.ribbon",
-"RIBBON_BAR_SHOW_PAGE_LABELS":"wx.ribbon",
-"RIBBON_BAR_SHOW_PANEL_EXT_BUTTONS":"wx.ribbon",
-"RIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS":"wx.ribbon",
-"RIBBON_BAR_SHOW_TOGGLE_BUTTON":"wx.ribbon",
+"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_ACTIVE_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_LABEL_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR":"wx.ribbon.",
+"RIBBON_ART_BUTTON_BAR_LABEL_FONT":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_FACE_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_GALLERY_ITEM_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BORDER_BOTTOM_SIZE":"wx.ribbon.",
+"RIBBON_ART_PAGE_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_BORDER_LEFT_SIZE":"wx.ribbon.",
+"RIBBON_ART_PAGE_BORDER_RIGHT_SIZE":"wx.ribbon.",
+"RIBBON_ART_PAGE_BORDER_TOP_SIZE":"wx.ribbon.",
+"RIBBON_ART_PAGE_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_HOVER_LABEL_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_LABEL_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_LABEL_FONT":"wx.ribbon.",
+"RIBBON_ART_PANEL_MINIMISED_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_MINIMISED_BORDER_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_MINIMISED_LABEL_COLOUR":"wx.ribbon.",
+"RIBBON_ART_PANEL_X_SEPARATION_SIZE":"wx.ribbon.",
+"RIBBON_ART_PANEL_Y_SEPARATION_SIZE":"wx.ribbon.",
+"RIBBON_ART_TAB_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_LABEL_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_LABEL_FONT":"wx.ribbon.",
+"RIBBON_ART_TAB_SEPARATION_SIZE":"wx.ribbon.",
+"RIBBON_ART_TAB_SEPARATOR_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOLBAR_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOLBAR_FACE_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOLBAR_HOVER_BORDER_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_GROUP_SEPARATION_SIZE":"wx.ribbon.",
+"RIBBON_ART_TOOL_HOVER_BACKGROUND_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_HOVER_BACKGROUND_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_COLOUR":"wx.ribbon.",
+"RIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR":"wx.ribbon.",
+"RIBBON_BAR_ALWAYS_SHOW_TABS":"wx.ribbon.",
+"RIBBON_BAR_DEFAULT_STYLE":"wx.ribbon.",
+"RIBBON_BAR_EXPANDED":"wx.ribbon.",
+"RIBBON_BAR_FLOW_HORIZONTAL":"wx.ribbon.",
+"RIBBON_BAR_FLOW_VERTICAL":"wx.ribbon.",
+"RIBBON_BAR_FOLDBAR_STYLE":"wx.ribbon.",
+"RIBBON_BAR_MINIMIZED":"wx.ribbon.",
+"RIBBON_BAR_PINNED":"wx.ribbon.",
+"RIBBON_BAR_SHOW_HELP_BUTTON":"wx.ribbon.",
+"RIBBON_BAR_SHOW_PAGE_ICONS":"wx.ribbon.",
+"RIBBON_BAR_SHOW_PAGE_LABELS":"wx.ribbon.",
+"RIBBON_BAR_SHOW_PANEL_EXT_BUTTONS":"wx.ribbon.",
+"RIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS":"wx.ribbon.",
+"RIBBON_BAR_SHOW_TOGGLE_BUTTON":"wx.ribbon.",
 "RIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_DISABLED":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_DROPDOWN_HOVERED":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_HOVER_MASK":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_LARGE":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_MEDIUM":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_SIZE_MASK":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_SMALL":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_STATE_MASK":"wx.ribbon",
-"RIBBON_BUTTONBAR_BUTTON_TOGGLED":"wx.ribbon",
-"RIBBON_BUTTON_DROPDOWN":"wx.ribbon",
-"RIBBON_BUTTON_HYBRID":"wx.ribbon",
-"RIBBON_BUTTON_NORMAL":"wx.ribbon",
-"RIBBON_BUTTON_TOGGLE":"wx.ribbon",
-"RIBBON_GALLERY_BUTTON_ACTIVE":"wx.ribbon",
-"RIBBON_GALLERY_BUTTON_DISABLED":"wx.ribbon",
-"RIBBON_GALLERY_BUTTON_HOVERED":"wx.ribbon",
-"RIBBON_GALLERY_BUTTON_NORMAL":"wx.ribbon",
-"RIBBON_PANEL_DEFAULT_STYLE":"wx.ribbon",
-"RIBBON_PANEL_EXT_BUTTON":"wx.ribbon",
-"RIBBON_PANEL_FLEXIBLE":"wx.ribbon",
-"RIBBON_PANEL_MINIMISE_BUTTON":"wx.ribbon",
-"RIBBON_PANEL_NO_AUTO_MINIMISE":"wx.ribbon",
-"RIBBON_PANEL_STRETCH":"wx.ribbon",
-"RIBBON_SCROLL_BTN_ACTIVE":"wx.ribbon",
-"RIBBON_SCROLL_BTN_DIRECTION_MASK":"wx.ribbon",
-"RIBBON_SCROLL_BTN_DOWN":"wx.ribbon",
-"RIBBON_SCROLL_BTN_FOR_MASK":"wx.ribbon",
-"RIBBON_SCROLL_BTN_FOR_OTHER":"wx.ribbon",
-"RIBBON_SCROLL_BTN_FOR_PAGE":"wx.ribbon",
-"RIBBON_SCROLL_BTN_FOR_TABS":"wx.ribbon",
-"RIBBON_SCROLL_BTN_HOVERED":"wx.ribbon",
-"RIBBON_SCROLL_BTN_LEFT":"wx.ribbon",
-"RIBBON_SCROLL_BTN_NORMAL":"wx.ribbon",
-"RIBBON_SCROLL_BTN_RIGHT":"wx.ribbon",
-"RIBBON_SCROLL_BTN_STATE_MASK":"wx.ribbon",
-"RIBBON_SCROLL_BTN_UP":"wx.ribbon",
+"RIBBON_BUTTONBAR_BUTTON_DISABLED":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_DROPDOWN_HOVERED":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_HOVER_MASK":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_LARGE":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_MEDIUM":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_SIZE_MASK":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_SMALL":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_STATE_MASK":"wx.ribbon.",
+"RIBBON_BUTTONBAR_BUTTON_TOGGLED":"wx.ribbon.",
+"RIBBON_BUTTON_DROPDOWN":"wx.ribbon.",
+"RIBBON_BUTTON_HYBRID":"wx.ribbon.",
+"RIBBON_BUTTON_NORMAL":"wx.ribbon.",
+"RIBBON_BUTTON_TOGGLE":"wx.ribbon.",
+"RIBBON_GALLERY_BUTTON_ACTIVE":"wx.ribbon.",
+"RIBBON_GALLERY_BUTTON_DISABLED":"wx.ribbon.",
+"RIBBON_GALLERY_BUTTON_HOVERED":"wx.ribbon.",
+"RIBBON_GALLERY_BUTTON_NORMAL":"wx.ribbon.",
+"RIBBON_PANEL_DEFAULT_STYLE":"wx.ribbon.",
+"RIBBON_PANEL_EXT_BUTTON":"wx.ribbon.",
+"RIBBON_PANEL_FLEXIBLE":"wx.ribbon.",
+"RIBBON_PANEL_MINIMISE_BUTTON":"wx.ribbon.",
+"RIBBON_PANEL_NO_AUTO_MINIMISE":"wx.ribbon.",
+"RIBBON_PANEL_STRETCH":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_ACTIVE":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_DIRECTION_MASK":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_DOWN":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_FOR_MASK":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_FOR_OTHER":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_FOR_PAGE":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_FOR_TABS":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_HOVERED":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_LEFT":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_NORMAL":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_RIGHT":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_STATE_MASK":"wx.ribbon.",
+"RIBBON_SCROLL_BTN_UP":"wx.ribbon.",
 "RICHTEXT_ALL":"wx.richtext.",
 "RICHTEXT_ALT_DOWN":"wx.richtext.",
 "RICHTEXT_CACHE_SIZE":"wx.richtext.",
@@ -2821,28 +2821,28 @@
 "RendererNative":"wx.",
 "RendererVersion":"wx.",
 "ResourceCat":"wx.StandardPaths.",
-"RibbonArtProvider":"wx.ribbon",
-"RibbonArtSetting":"wx.ribbon",
-"RibbonBar":"wx.ribbon",
-"RibbonBarEvent":"wx.ribbon",
-"RibbonBarOption":"wx.ribbon",
-"RibbonButtonBar":"wx.ribbon",
-"RibbonButtonBarButtonState":"wx.ribbon",
-"RibbonButtonBarEvent":"wx.ribbon",
-"RibbonButtonKind":"wx.ribbon",
-"RibbonControl":"wx.ribbon",
-"RibbonDisplayMode":"wx.ribbon",
-"RibbonGallery":"wx.ribbon",
-"RibbonGalleryButtonState":"wx.ribbon",
-"RibbonGalleryEvent":"wx.ribbon",
-"RibbonPage":"wx.ribbon",
-"RibbonPageTabInfo":"wx.ribbon",
-"RibbonPanel":"wx.ribbon",
-"RibbonPanelEvent":"wx.ribbon",
-"RibbonPanelOption":"wx.ribbon",
-"RibbonScrollButtonStyle":"wx.ribbon",
-"RibbonToolBar":"wx.ribbon",
-"RibbonToolBarEvent":"wx.ribbon",
+"RibbonArtProvider":"wx.ribbon.",
+"RibbonArtSetting":"wx.ribbon.",
+"RibbonBar":"wx.ribbon.",
+"RibbonBarEvent":"wx.ribbon.",
+"RibbonBarOption":"wx.ribbon.",
+"RibbonButtonBar":"wx.ribbon.",
+"RibbonButtonBarButtonState":"wx.ribbon.",
+"RibbonButtonBarEvent":"wx.ribbon.",
+"RibbonButtonKind":"wx.ribbon.",
+"RibbonControl":"wx.ribbon.",
+"RibbonDisplayMode":"wx.ribbon.",
+"RibbonGallery":"wx.ribbon.",
+"RibbonGalleryButtonState":"wx.ribbon.",
+"RibbonGalleryEvent":"wx.ribbon.",
+"RibbonPage":"wx.ribbon.",
+"RibbonPageTabInfo":"wx.ribbon.",
+"RibbonPanel":"wx.ribbon.",
+"RibbonPanelEvent":"wx.ribbon.",
+"RibbonPanelOption":"wx.ribbon.",
+"RibbonScrollButtonStyle":"wx.ribbon.",
+"RibbonToolBar":"wx.ribbon.",
+"RibbonToolBarEvent":"wx.ribbon.",
 "RichMessageDialog":"wx.",
 "RichTextAction":"wx.richtext.",
 "RichTextApplyStyle":"wx.richtext.",
@@ -6123,20 +6123,23 @@
 "wxEVT_QUERY_NEW_PALETTE":"wx.",
 "wxEVT_RADIOBOX":"wx.",
 "wxEVT_RADIOBUTTON":"wx.",
-"wxEVT_RIBBONBAR_HELP_CLICK":"wx.ribbon",
-"wxEVT_RIBBONBAR_PAGE_CHANGED":"wx.ribbon",
-"wxEVT_RIBBONBAR_PAGE_CHANGING":"wx.ribbon",
-"wxEVT_RIBBONBAR_TAB_LEFT_DCLICK":"wx.ribbon",
-"wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN":"wx.ribbon",
-"wxEVT_RIBBONBAR_TAB_MIDDLE_UP":"wx.ribbon",
-"wxEVT_RIBBONBAR_TAB_RIGHT_DOWN":"wx.ribbon",
-"wxEVT_RIBBONBAR_TAB_RIGHT_UP":"wx.ribbon",
-"wxEVT_RIBBONBAR_TOGGLED":"wx.ribbon",
-"wxEVT_RIBBONBUTTONBAR_CLICKED":"wx.ribbon",
-"wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED":"wx.ribbon",
-"wxEVT_RIBBONGALLERY_CLICKED":"wx.ribbon",
-"wxEVT_RIBBONGALLERY_HOVER_CHANGED":"wx.ribbon",
-"wxEVT_RIBBONGALLERY_SELECTED":"wx.ribbon",
+"wxEVT_RIBBONBAR_HELP_CLICK":"wx.ribbon.",
+"wxEVT_RIBBONBAR_PAGE_CHANGED":"wx.ribbon.",
+"wxEVT_RIBBONBAR_PAGE_CHANGING":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TAB_LEFT_DCLICK":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TAB_MIDDLE_UP":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TAB_RIGHT_DOWN":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TAB_RIGHT_UP":"wx.ribbon.",
+"wxEVT_RIBBONBAR_TOGGLED":"wx.ribbon.",
+"wxEVT_RIBBONBUTTONBAR_CLICKED":"wx.ribbon.",
+"wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED":"wx.ribbon.",
+"wxEVT_RIBBONGALLERY_CLICKED":"wx.ribbon.",
+"wxEVT_RIBBONGALLERY_HOVER_CHANGED":"wx.ribbon.",
+"wxEVT_RIBBONGALLERY_SELECTED":"wx.ribbon.",
+"wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED":"wx.ribbon.",
+"wxEVT_RIBBONTOOLBAR_CLICKED":"wx.ribbon.",
+"wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED":"wx.ribbon.",
 "wxEVT_RICHTEXT_BUFFER_RESET":"wx.richtext.",
 "wxEVT_RICHTEXT_CHARACTER":"wx.richtext.",
 "wxEVT_RICHTEXT_CONSUMING_CHARACTER":"wx.richtext.",
diff --git a/sphinxtools/constants.py b/sphinxtools/constants.py
index fc2456be..f4846187 100644
--- a/sphinxtools/constants.py
+++ b/sphinxtools/constants.py
@@ -83,7 +83,7 @@ MODULENAME_REPLACE = {'_core'    : 'wx.',
                       '_webkit'  : 'wx.webkit.',
                       '_media'   : 'wx.media.',
                       '_msw'     : 'wx.msw.',
-                      '_ribbon'  : 'wx.ribbon',
+                      '_ribbon'  : 'wx.ribbon.',
                       }