diff --git a/TODO.rst b/TODO.rst
index 25a9b571..08edb49a 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -105,9 +105,6 @@ The above docs changes are mostly done, it's been a bit of a 3 steps forward,
 2 steps back kind of journey. Here are some dangling strings that still need
 to be untangled:
 
-  * Nested enums are still being generated in files without the leading
-    package names, needs to be switched to fullname.
-
   * The `chopDescription()` function is not very smart. See if it can be made a
     little smarter and pull out the first sentence from the docstring instead
     of ust the first line.
@@ -134,8 +131,6 @@ to be untangled:
     directive? Or maybe because of using the fullname in the doc title.
     Figure it out and fix it.
 
-   * [fixed] Something happened to the link color.  I didn't particularly like the old
-     one, but it changing for no reason is a little worrisome.
 
 
 
diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index 3c6adda1..3c46287e 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -96,6 +96,7 @@
 "ArtID":"wx.",
 "ArtProvider":"wx.",
 "AssertHandler_t":"wx.",
+"AttrKind":"wx.grid.GridCellAttr.",
 "AutoBufferedPaintDC":"wx.",
 "AutoBufferedPaintDCFactory":"wx.",
 "BACKINGSTORE":"wx.",
@@ -195,6 +196,7 @@
 "CYAN_BRUSH":"wx.",
 "CYAN_PEN":"wx.",
 "CalculateLayoutEvent":"wx.adv.",
+"Calendar":"wx.DateTime.",
 "CalendarCtrl":"wx.adv.",
 "CalendarDateAttr":"wx.adv.",
 "CalendarDateBorder":"wx.adv.",
@@ -204,6 +206,7 @@
 "CallAfter":"wx.",
 "CallLater":"wx.",
 "Caret":"wx.",
+"CellSpan":"wx.grid.Grid.",
 "Char":"wx.",
 "Char16":"wx.",
 "Char32":"wx.",
@@ -252,6 +255,7 @@
 "ControlNameStr":"wx.",
 "ControlWithItems":"wx.",
 "Coord":"wx.",
+"Country":"wx.DateTime.",
 "CreateDynamicObject":"wx.",
 "CreateFileTipProvider":"wx.adv.",
 "Cursor":"wx.",
@@ -368,7 +372,7 @@
 "DirPickerWidgetNameStr":"wx.",
 "DirSelector":"wx.",
 "DirSelectorPromptStr":"wx.",
-"Direction":"wx.",
+"Direction":"wx.DataObject.",
 "DisableAsserts":"wx.",
 "Display":"wx.",
 "DisplayChangedEvent":"wx.",
@@ -403,6 +407,7 @@
 "EndBusyCursor":"wx.",
 "Endianness":"wx.",
 "Entry":"wx.",
+"EntryType":"wx.ConfigBase.",
 "EnvVariableHashMap":"wx.",
 "EraseEvent":"wx.",
 "Event":"wx.",
@@ -627,6 +632,7 @@
 "GridRenderStyle":"wx.grid.",
 "GridRowHeaderRenderer":"wx.grid.",
 "GridRowHeaderRendererDefault":"wx.grid.",
+"GridSelectionModes":"wx.grid.Grid.",
 "GridSizeEvent":"wx.grid.",
 "GridSizer":"wx.",
 "GridSizesInfo":"wx.grid.",
@@ -663,6 +669,7 @@
 "HSCROLL":"wx.",
 "HSVValue":"wx.Image.",
 "HScrolledWindow":"wx.",
+"HTMLCursor":"wx.html.HtmlWindowInterface.",
 "HTMLDataObject":"wx.",
 "HTML_ALIGN_BOTTOM":"wx.html.",
 "HTML_ALIGN_CENTER":"wx.html.",
@@ -872,6 +879,7 @@
 "Kill":"wx.",
 "KillError":"wx.",
 "KillFlags":"wx.",
+"Kind":"wx.StockPreferencesPage.",
 "LAYOUT_DEFAULT_MARGIN":"wx.",
 "LB_ALIGN_MASK":"wx.",
 "LB_ALWAYS_SB":"wx.",
@@ -1029,6 +1037,7 @@
 "MiniFrame":"wx.",
 "MirrorDC":"wx.",
 "ModalDialogHook":"wx.",
+"Month":"wx.DateTime.",
 "MouseButton":"wx.",
 "MouseCaptureChangedEvent":"wx.",
 "MouseCaptureLostEvent":"wx.",
@@ -1054,10 +1063,12 @@
 "NO_DEFAULT":"wx.",
 "NO_FULL_REPAINT_ON_RESIZE":"wx.",
 "NO_IMAGE":"wx.",
+"NameFlags":"wx.DateTime.",
 "NativeFontInfo":"wx.",
 "NativePixelData":"wx.",
 "NativePixelData_Accessor":"wx.",
 "NavigationKeyEvent":"wx.",
+"NavigationKeyEventFlags":"wx.NavigationKeyEvent.",
 "NewEventType":"wx.",
 "NewId":"wx.",
 "NonOwnedWindow":"wx.",
@@ -1090,6 +1101,7 @@
 "ObjectRefData":"wx.",
 "OperatingSystemId":"wx.",
 "Orientation":"wx.",
+"Origin":"wx.HelpEvent.",
 "OutCode":"wx.",
 "OutputStream":"wx.",
 "Overlay":"wx.",
@@ -1285,6 +1297,7 @@
 "RearrangeDialogNameStr":"wx.",
 "RearrangeList":"wx.",
 "RearrangeListNameStr":"wx.",
+"Reason":"wx.ActivateEvent.",
 "Rect":"wx.",
 "Rect2D":"wx.",
 "RefCounter":"wx.",
@@ -1295,6 +1308,7 @@
 "Relationship":"wx.",
 "RendererNative":"wx.",
 "RendererVersion":"wx.",
+"ResourceCat":"wx.StandardPaths.",
 "RichMessageDialog":"wx.",
 "RichTextAction":"wx.richtext.",
 "RichTextApplyStyle":"wx.richtext.",
@@ -1356,6 +1370,7 @@
 "RichTextStyleListCtrl":"wx.richtext.",
 "RichTextStyleOrganiserDialog":"wx.richtext.",
 "RichTextStyleSheet":"wx.richtext.",
+"RichTextStyleType":"wx.richtext.RichTextStyleListBox.",
 "RichTextTable":"wx.richtext.",
 "RichTextTabsEq":"wx.richtext.",
 "RichTextXMLHandler":"wx.richtext.",
@@ -3550,6 +3565,8 @@
 "TR_ROW_LINES":"wx.",
 "TR_SINGLE":"wx.",
 "TR_TWIST_BUTTONS":"wx.",
+"TZ":"wx.DateTime.",
+"TabBehaviour":"wx.grid.Grid.",
 "TaskBarIcon":"wx.adv.",
 "TaskBarIconEvent":"wx.adv.",
 "TaskBarIconType":"wx.adv.",
@@ -3723,6 +3740,8 @@
 "WebViewReloadFlags":"wx.html2.",
 "WebViewZoom":"wx.html2.",
 "WebViewZoomType":"wx.html2.",
+"WeekDay":"wx.DateTime.",
+"WeekFlags":"wx.DateTime.",
 "Window":"wx.",
 "WindowBase":"wx.",
 "WindowCreateEvent":"wx.",
@@ -3757,6 +3776,7 @@
 "YES":"wx.",
 "YES_DEFAULT":"wx.",
 "YES_NO":"wx.",
+"Year":"wx.DateTime.",
 "Yield":"wx.",
 "_":"wx.",
 "__DECLARE_EVT0":"wx.",
diff --git a/etgtools/map_generator.py b/etgtools/map_generator.py
index 394d51ae..388f384e 100644
--- a/etgtools/map_generator.py
+++ b/etgtools/map_generator.py
@@ -39,11 +39,17 @@ class ItemMapGenerator(generators.DocsGeneratorBase):
                 continue
 
             if isinstance(item, extractors.ClassDef):
+                # are there nested classes?
                 for inner in item.innerclasses:
                     self.generateInnerClass(inner, imm,
                                             '{}{}.'.format(realModuleName, name))
-            # TODO: Maybe nested enums too?
 
+                # Check for nested enums too
+                for classItem in item.items:
+                    if isinstance(classItem, extractors.EnumDef):
+                        enumName = self._getName(classItem)
+                        if not enumName.startswith('@'):
+                            imm[enumName] = '{}{}.'.format(realModuleName, name)
 
             # save the module that the name belongs to
             imm[name] = realModuleName