diff --git a/modules/rna_wiki_reference.py b/modules/rna_wiki_reference.py
index 068396320249708f61f499abc9c5ed32ff856733..76383bfac6186dec7a9dd1f1c5b4b9e3ccce147c 100644
--- a/modules/rna_wiki_reference.py
+++ b/modules/rna_wiki_reference.py
@@ -114,7 +114,7 @@ url_manual_mapping = (
     #("bpy.types.Mask.*", ""), # TODO - manual has no place for this! XXX
     # *** Materials (blender internal) ***
     ("bpy.types.Material.diffuse*", "Materials/Properties/Diffuse_Shaders"),
-    ("bpy.types.Material.*", "Materials/Properties/Diffuse_Shaders"),  # catchall, until the section is filled in
+    ("bpy.types.Material.*", "Materials"),  # catchall, until the section is filled in
     # ... todo, many more options
     ("bpy.types.MovieClip.*", "Motion_Tracking#Movie_Clip_Editor"),
     #("bpy.types.NodeTree.*", ""),  # dont document
@@ -190,46 +190,43 @@ url_manual_mapping = (
     # ("bpy.ops.import_curve.*",  ""),  # TODO
     # ("bpy.ops.import_mesh.*",  ""),  # TODO
     # ("bpy.ops.import_scene.*",  ""),  # TODO
-    ("bpy.ops.info.*",  ""),
+    # ("bpy.ops.info.*",  ""),  # TODO
     ("bpy.ops.lamp.*",  "Lighting"),  # --- TODO ... all below ---
-    ("bpy.ops.lattice.*",  ""),
-    ("bpy.ops.logic.*",  ""),
-    ("bpy.ops.marker.*",  ""),
-    ("bpy.ops.mask.*",  ""),
-    ("bpy.ops.material.*",  ""),
-    ("bpy.ops.mball.*",  ""),
-    ("bpy.ops.mesh.*",  ""),
-    ("bpy.ops.nla.*",  ""),
-    ("bpy.ops.node.*",  ""),
-    ("bpy.ops.object.*",  ""),
-    ("bpy.ops.outliner.*",  ""),
-    ("bpy.ops.paint.*",  ""),
-    ("bpy.ops.particle.*",  ""),
-    ("bpy.ops.pose.*",  ""),
-    ("bpy.ops.poselib.*",  ""),
-    ("bpy.ops.ptcache.*",  ""),
+    # ("bpy.ops.lattice.*",  ""),  # TODO
+    ("bpy.ops.logic.*",  "Game_Engine/Logic"),
+    ("bpy.ops.marker.*",  "Animation/Markers"),
+    # ("bpy.ops.mask.*",  ""),  # TODO
+    ("bpy.ops.material.*",  "Materials"),
+    ("bpy.ops.mball.*",  "Modeling/Metas"),
+    ("bpy.ops.mesh.*",  "Modeling/Meshes"),
+    ("bpy.ops.nla.*",  "Animation/Editors/NLA"),
+    # ("bpy.ops.node.*",  ""),  # TODO
+    ("bpy.ops.object.*",  "Modeling/Objects"),
+    ("bpy.ops.outliner.*",  "Data_System/The_Outliner"),
+    # ("bpy.ops.paint.*",  ""),  # TODO
+    ("bpy.ops.particle.*",  "Physics/Particles"),
+    ("bpy.ops.pose.*",  "Rigging/Posing"),
+    ("bpy.ops.poselib.*",  "Rigging/Posing/Pose_Library"),
+    # ("bpy.ops.ptcache.*",  ""),  # TODO
     ("bpy.ops.render.*",  "Render"),
-    ("bpy.ops.scene.*",  ""),
+    ("bpy.ops.scene.*",  "Interface/Scenes"),
     ("bpy.ops.screen.*",  "Interface/Window_system"),
-    ("bpy.ops.script.*",  ""),
-    ("bpy.ops.sculpt.*",  ""),
-    ("bpy.ops.sequencer.*",  ""),
-    ("bpy.ops.sketch.*",  ""),
-    ("bpy.ops.sound.*",  ""),
-    ("bpy.ops.surface.*",  ""),
-    ("bpy.ops.text.*",  ""),
-    ("bpy.ops.texture.*",  ""),
-    ("bpy.ops.time.*",  ""),
-    ("bpy.ops.transform.*",  ""),
-    ("bpy.ops.ui.*",  ""),
-    ("bpy.ops.uv.*",  ""),
-    ("bpy.ops.view2d.*",  ""),
-    ("bpy.ops.view3d.*",  ""),
+    ("bpy.ops.script.*",  "Extensions/Python"),
+    ("bpy.ops.sculpt.*",  "Modeling/Meshes/Editing/Sculpt_Mode"),
+    ("bpy.ops.sequencer.*",  "Sequencer/Usage"),
+    # ("bpy.ops.sketch.*",  ""),  # TODO
+    # ("bpy.ops.sound.*",  ""),  # TODO
+    ("bpy.ops.surface.*",  "Modeling/Surfaces"),
+    ("bpy.ops.text.*",  "Extensions/Python/Text_editor"),
+    ("bpy.ops.texture.*",  "Textures"),
+    ("bpy.ops.time.*",  "Animation/Timeline"),
+    ("bpy.ops.transform.*",  "3D_interaction/Transform_Control"),
+    ("bpy.ops.ui.*",  "Interface"),
+    ("bpy.ops.uv.*",  "Textures/Mapping/UV/Layout_Editing"),
+    # ("bpy.ops.view2d.*",  ""),  # TODO
+    ("bpy.ops.view3d.*",  "3D_interaction/Navigating/3D_View"),  # this link is a bit arbitrary
     ("bpy.ops.wm.*",      "Interface/Window_system"),
-    ("bpy.ops.world.*",  ""),
+    ("bpy.ops.world.*",  "World"),
 )
 
 # may have 'url_reference_mapping'... etc later
-"""
-
-"""
\ No newline at end of file