diff --git a/modules/rna_wiki_reference.py b/modules/rna_wiki_reference.py
index b68363b943900b744e1659e4fff80750b32500de..068396320249708f61f499abc9c5ed32ff856733 100644
--- a/modules/rna_wiki_reference.py
+++ b/modules/rna_wiki_reference.py
@@ -104,7 +104,7 @@ url_manual_mapping = (
     ("bpy.types.Action.*", "Animation/Actions"),
     #("bpy.types.Brush.*", ""),  # TODO - manual has no place for this! XXX
     ("bpy.types.Curve.*", "Modeling/Curves"),
-    #("bpy.types.GreasePencil.*", ""), # TODO - manual has no place for this! XXX
+    ("bpy.types.GreasePencil.*", "3D_interaction/Sketching/Drawing"),
     ("bpy.types.Group.*", "Modeling/Objects/Groups_and_Parenting#Grouping_objects"),
     ("bpy.types.Image.*", "Textures/Types/Image"),
     ("bpy.types.ShapeKey.*", "Animation/Basic/Deformation/Shape_Keys"), # not an ID but include because of Key
@@ -146,7 +146,7 @@ url_manual_mapping = (
 
     # --- Animation ---
     ("bpy.types.Keyframe.*", "Animation/Keyframes"),
-    ("bpy.types.FCurve.*", "Animation/FCurves"),
+    ("bpy.types.FCurve.*", "Animation/Editors/Graph/FCurves"),
     
     # --- Rigging ---
     ("bpy.types.Bone.*",      "Armatures/Bones"),
@@ -159,11 +159,74 @@ url_manual_mapping = (
     ("bpy.types.Texture.*",  "Textures"),
 
     # === Operators ===
-
+    # Catch all only for now!
     # *** Window/Screen ***
+    
+    ("bpy.ops.action.*",  "Animation/Actions"),
+    ("bpy.ops.anim.*",  "Animation"),
+    ("bpy.ops.armature.*",  "Rigging/Armatures"),
+    ("bpy.ops.boid.*",  "Physics/Particles/Physics/Boids"),
+    # ("bpy.ops.brush.*",  ""),  # TODO
+    ("bpy.ops.buttons.*",  "Interface/Buttons_and_Controls"),
+    ("bpy.ops.camera.*",  "Render/Camera"),
+    ("bpy.ops.clip.*",  "Motion_Tracking#Movie_Clip_Editor"),
+    ("bpy.ops.cloth.*",  "Physics/Cloth"),
+    ("bpy.ops.console.*",  "Python/Console"),
+    ("bpy.ops.constraint.*",  "Constraints"),
+    ("bpy.ops.curve.*",  "Modeling/Curves"),
+    ("bpy.ops.dpaint.*",  "Physics/Dynamic_Paint"),
+    # ("bpy.ops.ed.*",  ""),  # TODO, this is for internal use only?
+    # ("bpy.ops.export_anim.*",  ""),  # TODO
+    # ("bpy.ops.export_mesh.*",  ""),  # TODO
+    # ("bpy.ops.export_scene.*",  ""),  # TODO
+    ("bpy.ops.file.*",  ""),
+    ("bpy.ops.fluid.*",  "Physics/Fluid"),
+    ("bpy.ops.font.*",  "Modeling/Texts"),
+    ("bpy.ops.gpencil.*",  "3D_interaction/Sketching/Drawing"),
+    ("bpy.ops.graph.*",  "Animation/Editors/Graph/FCurves"),
+    ("bpy.ops.group.*",  "Modeling/Objects/Groups_and_Parenting#Grouping_objects"),
+    ("bpy.ops.image.*",  "Textures/Types/Image"),
+    # ("bpy.ops.import_anim.*",  ""),  # TODO
+    # ("bpy.ops.import_curve.*",  ""),  # TODO
+    # ("bpy.ops.import_mesh.*",  ""),  # TODO
+    # ("bpy.ops.import_scene.*",  ""),  # TODO
+    ("bpy.ops.info.*",  ""),
+    ("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.render.*",  "Render"),
+    ("bpy.ops.scene.*",  ""),
     ("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.wm.*",      "Interface/Window_system"),
-    ("bpy.ops.render.*",  "Render"),  # catchall, TODO - refine
+    ("bpy.ops.world.*",  ""),
 )
 
 # may have 'url_reference_mapping'... etc later