diff --git a/docs/sphinx/_templates/main.html b/docs/sphinx/_templates/main.html
index 5a6bf309..557efb7f 100644
--- a/docs/sphinx/_templates/main.html
+++ b/docs/sphinx/_templates/main.html
@@ -50,57 +50,57 @@
   <table class="contentstable" align="center" style="margin-left: 25px">
     <tr>
     <td width="50%" valign="top">
-      <p class="biglink"><a class="biglink" href="{{ pathto("1classindex") }}">Core wx Classes</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.1classindex") }}">Core wx Classes</a><br/>
          <span class="linkdescr">The classes which appear in the main wx namespace</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("functions") }}">Core Functions</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.functions") }}">Core Functions</a><br/>
          <span class="linkdescr">Standalone functions in the main wx namespace</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("adv.1classindex") }}">wx.adv</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.adv.1classindex") }}">wx.adv</a><br/>
          <span class="linkdescr">Less commonly used or more advanced classes</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("dataview.1classindex") }}">wx.dataview</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.dataview.1classindex") }}">wx.dataview</a><br/>
          <span class="linkdescr">Classes for viewing tabular or hierarchical data</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("stc.1classindex") }}">wx.stc</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.stc.1classindex") }}">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("html.1classindex") }}">wx.html</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.html.1classindex") }}">wx.html</a><br/>
          <span class="linkdescr">Widget and supporting classes for a generic html renderer</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("html2.1classindex") }}">wx.html2</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.html2.1classindex") }}">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("grid.1classindex") }}">wx.grid</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.grid.1classindex") }}">wx.grid</a><br/>
          <span class="linkdescr">Widget and supporting classes for displaying and editing tabular data</span></p>
 
     </td>
     <td valign="top" width="50%" style="margin-left: 5px">
-      <p class="biglink"><a class="biglink" href="{{ pathto("lib") }}">wx.lib</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.lib") }}">wx.lib</a><br/>
          <span class="linkdescr">Our pure-Python library of widgets</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("glcanvas.1classindex") }}">wx.glcanvas</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.glcanvas.1classindex") }}">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("richtext.1classindex") }}">wx.richtext</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.richtext.1classindex") }}">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("xrc.1classindex") }}">wx.xrc</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xrc.1classindex") }}">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("media.1classindex") }}">wx.media</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.media.1classindex") }}">wx.media</a><br/>
          <span class="linkdescr">MediaCtrl and related classes</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("xml.1classindex") }}">wx.xml</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xml.1classindex") }}">wx.xml</a><br/>
          <span class="linkdescr">Some simple XML classes for use with XRC</span></p>
 
-      <p class="biglink"><a class="biglink" href="msw.1classindex.html">wx.msw</a><br/>
-         <span class="linkdescr">A few classes available only Windows</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.msw.1classindex.html") }}>wx.msw</a><br/>
+         <span class="linkdescr">A few classes available only on Windows</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("py") }}">wx.py</a><br/>
+      <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>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("tools") }}">wx.tools</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.tools") }}">wx.tools</a><br/>
          <span class="linkdescr">Some useful tools and utilities for wxPython.</span></p>
 
     </td></tr>