operator renaming for more consistent word ordering (_add/_remmove shold be last...
[blender.git] / release / scripts / ui / space_view3d.py
index f5c7c6c9e24a41a55feffb42b6989a88e6c3313f..de186f4b8a7b5ff8d1425115cf1baa2bbfec244e 100644 (file)
@@ -1,14 +1,25 @@
-# This software is distributable under the terms of the GNU
-# General Public License (GPL) v2, the text of which can be found at
-# http://www.gnu.org/copyleft/gpl.html. Installing, importing or otherwise
-# using this module constitutes acceptance of the terms of this License.
-
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
 
+# <pep8 compliant>
 import bpy
-
 import dynamic_menu
 
-# ********** Header **********
 
 class VIEW3D_HT_header(bpy.types.Header):
     bl_space_type = 'VIEW_3D'
@@ -16,7 +27,7 @@ class VIEW3D_HT_header(bpy.types.Header):
     def draw(self, context):
         layout = self.layout
 
-        view = context.space_data
+        view = context.space_data
         mode_string = context.mode
         edit_object = context.edit_object
         object = context.active_object
@@ -28,21 +39,19 @@ class VIEW3D_HT_header(bpy.types.Header):
         if context.area.show_menus:
             sub = row.row(align=True)
 
-            sub.itemM("VIEW3D_MT_view")
+            sub.menu("VIEW3D_MT_view")
 
             # Select Menu
             if mode_string not in ('EDIT_TEXT', 'SCULPT', 'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'):
-                sub.itemM("VIEW3D_MT_select_%s" % mode_string.lower())
+                sub.menu("VIEW3D_MT_select_%s" % mode_string.lower())
 
             if edit_object:
-                sub.itemM("VIEW3D_MT_edit_%s" % edit_object.type.lower())
+                sub.menu("VIEW3D_MT_edit_%s" % edit_object.type.lower())
             elif object:
-                ob_mode_string = object.mode
-
                 if mode_string not in ['PAINT_WEIGHT', 'PAINT_TEXTURE']:
-                    sub.itemM("VIEW3D_MT_%s" % mode_string.lower())
+                    sub.menu("VIEW3D_MT_%s" % mode_string.lower())
             else:
-                sub.itemM("VIEW3D_MT_object")
+                sub.menu("VIEW3D_MT_object")
 
         layout.template_header_3D()
 
@@ -50,6 +59,7 @@ class VIEW3D_HT_header(bpy.types.Header):
 
 # ********** Utilities **********
 
+
 class VIEW3D_MT_showhide(bpy.types.Menu):
     bl_label = "Show/Hide"
     _operator_name = ""
@@ -57,100 +67,191 @@ class VIEW3D_MT_showhide(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("%s.reveal" % self._operator_name, text="Show Hidden")
-        layout.itemO("%s.hide" % self._operator_name, text="Hide Selected")
-        layout.item_booleanO("%s.hide" % self._operator_name, "unselected", True, text="Hide Unselected")
+        layout.operator("%s.reveal" % self._operator_name, text="Show Hidden")
+        layout.operator("%s.hide" % self._operator_name, text="Hide Selected")
+        layout.operator("%s.hide" % self._operator_name, text="Hide Unselected").unselected = True
+
+
+class VIEW3D_MT_transform(bpy.types.Menu):
+    bl_label = "Transform"
+
+    # TODO: get rid of the custom text strings?
+    def draw(self, context):
+        layout = self.layout
+        
+        layout.operator("tfm.translate", text="Grab/Move")
+        # TODO: sub-menu for grab per axis
+        layout.operator("tfm.rotate", text="Rotate")
+        # TODO: sub-menu for rot per axis
+        layout.operator("tfm.resize", text="Scale")
+        # TODO: sub-menu for scale per axis
+        
+        layout.separator()
+        
+        layout.operator("tfm.tosphere", text="To Sphere")
+        layout.operator("tfm.shear", text="Shear")
+        layout.operator("tfm.warp", text="Warp")
+        layout.operator("tfm.transform", text="Push/Pull").mode = 'PUSHPULL'
+        if context.edit_object and context.edit_object.type == 'ARMATURE':
+            layout.operator("armature.align")
+        else:
+            layout.operator_context = 'EXEC_AREA'
+            layout.operator("tfm.transform", text="Align to Transform Orientation").mode = 'ALIGN' # XXX see alignmenu() in edit.c of b2.4x to get this working
+        
+        layout.separator()
+        
+        layout.operator_context = 'EXEC_AREA'
+        
+        layout.operator("object.center_set", text="ObData to Centroid").type = 'CENTER'
+        layout.operator("object.center_set", text="Centroid to ObData").type = 'CENTER_NEW'
+        layout.operator("object.center_set", text="Centroid to 3D Cursor").type = 'CENTER_CURSOR'
+     
+class VIEW3D_MT_mirror(bpy.types.Menu):
+    bl_label = "Mirror"
+
+    def draw(self, context):
+        layout = self.layout
 
+        layout.operator("tfm.mirror", text="Interactive Mirror")
+        
+        layout.separator()
+        
+        layout.operator_context = 'INVOKE_REGION_WIN'
+        
+        props = layout.operator("tfm.mirror", text="X Global")
+        props.constraint_axis = (True, False, False)
+        props.constraint_orientation = 'GLOBAL'
+        props = layout.operator("tfm.mirror", text="Y Global")
+        props.constraint_axis = (False, True, False)
+        props.constraint_orientation = 'GLOBAL'
+        props = layout.operator("tfm.mirror", text="Z Global")
+        props.constraint_axis = (False, False, True)
+        props.constraint_orientation = 'GLOBAL'
+        
+        if context.edit_object:
+            layout.separator()
+            
+            props = layout.operator("tfm.mirror", text="X Local")
+            props.constraint_axis = (True, False, False)
+            props.constraint_orientation = 'LOCAL'
+            props = layout.operator("tfm.mirror", text="Y Local")
+            props.constraint_axis = (False, True, False)
+            props.constraint_orientation = 'LOCAL'
+            props = layout.operator("tfm.mirror", text="Z Local")
+            props.constraint_axis = (False, False, True)
+            props.constraint_orientation = 'LOCAL'
+   
 class VIEW3D_MT_snap(bpy.types.Menu):
     bl_label = "Snap"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.snap_selected_to_grid", text="Selection to Grid")
-        layout.itemO("view3d.snap_selected_to_cursor", text="Selection to Cursor")
-        layout.itemO("view3d.snap_selected_to_center", text="Selection to Center")
+        layout.operator("view3d.snap_selected_to_grid", text="Selection to Grid")
+        layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor")
+        layout.operator("view3d.snap_selected_to_center", text="Selection to Center")
+
+        layout.separator()
+
+        layout.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected")
+        layout.operator("view3d.snap_cursor_to_grid", text="Cursor to Grid")
+        layout.operator("view3d.snap_cursor_to_active", text="Cursor to Active")
+
+
+class VIEW3D_MT_uv_map(dynamic_menu.DynMenu):
+    bl_label = "UV Mapping"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("uv.unwrap")
+        layout.operator("uv.cube_project")
+        layout.operator("uv.cylinder_project")
+        layout.operator("uv.sphere_project")
+        layout.operator("uv.project_from_view")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("view3d.snap_cursor_to_selected", text="Cursor to Selected")
-        layout.itemO("view3d.snap_cursor_to_grid", text="Cursor to Grid")
-        layout.itemO("view3d.snap_cursor_to_active", text="Cursor to Active")
+        layout.operator("uv.reset")
 
 # ********** View menus **********
 
+
 class VIEW3D_MT_view(bpy.types.Menu):
     bl_label = "View"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.properties", icon='ICON_MENU_PANEL')
-        layout.itemO("view3d.toolbar", icon='ICON_MENU_PANEL')
+        layout.operator("view3d.properties", icon='ICON_MENU_PANEL')
+        layout.operator("view3d.toolbar", icon='ICON_MENU_PANEL')
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_enumO("view3d.viewnumpad", "type", 'CAMERA')
-        layout.item_enumO("view3d.viewnumpad", "type", 'TOP')
-        layout.item_enumO("view3d.viewnumpad", "type", 'FRONT')
-        layout.item_enumO("view3d.viewnumpad", "type", 'RIGHT')
+        layout.operator("view3d.viewnumpad", text="Camera").type = 'CAMERA'
+        layout.operator("view3d.viewnumpad", text="Top").type = 'TOP'
+        layout.operator("view3d.viewnumpad", text="Front").type = 'FRONT'
+        layout.operator("view3d.viewnumpad", text="Right").type = 'RIGHT'
 
-        layout.itemM("VIEW3D_MT_view_cameras", text="Cameras")
+        layout.menu("VIEW3D_MT_view_cameras", text="Cameras")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("view3d.view_persportho")
+        layout.operator("view3d.view_persportho")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemM("VIEW3D_MT_view_navigation")
-        layout.itemM("VIEW3D_MT_view_align")
+        layout.menu("VIEW3D_MT_view_navigation")
+        layout.menu("VIEW3D_MT_view_align")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.operator_context = "INVOKE_REGION_WIN"
+        layout.operator_context = 'INVOKE_REGION_WIN'
+
+        layout.operator("view3d.clip_border", text="Clipping Border...")
+        layout.operator("view3d.zoom_border", text="Zoom Border...")
+
+        layout.separator()
 
-        layout.itemO("view3d.clip_border", text="Clipping Border...")
-        layout.itemO("view3d.zoom_border", text="Zoom Border...")
+        layout.operator("view3d.layers", text="Show All Layers").nr = 0
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_intO("view3d.layers", "nr", 0, text="Show All Layers")
+        layout.operator("view3d.localview", text="View Global/Local")
+        layout.operator("view3d.view_center")
+        layout.operator("view3d.view_all")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("view3d.localview", text="View Global/Local")
-        layout.itemO("view3d.view_center")
-        layout.itemO("view3d.view_all")
+        layout.operator("screen.region_foursplit", text="Toggle Quad View")
+        layout.operator("screen.screen_full_area", text="Toggle Full Screen")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("screen.region_foursplit", text="Toggle Quad View")
-        layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
+        layout.operator("screen.animation_play", text="Playback Animation", icon='ICON_PLAY')
 
-        layout.itemS()
 
-        layout.itemO("screen.animation_play", text="Playback Animation", icon='ICON_PLAY')
 class VIEW3D_MT_view_navigation(bpy.types.Menu):
     bl_label = "Navigation"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.items_enumO("view3d.view_orbit", "type")
+        layout.operator_enums("view3d.view_orbit", "type")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.items_enumO("view3d.view_pan", "type")
+        layout.operator_enums("view3d.view_pan", "type")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_floatO("view3d.zoom", "delta", 1.0, text="Zoom In")
-        layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom Out")
+        layout.operator("view3d.zoom", text="Zoom In").delta = 1.0
+        layout.operator("view3d.zoom", text="Zoom Out").delta = -1.0
 
-        layout.itemS()
+        layout.separator()
+
+        layout.operator("view3d.fly")
 
-        layout.itemO("view3d.fly")
 
 class VIEW3D_MT_view_align(bpy.types.Menu):
     bl_label = "Align View"
@@ -158,9 +259,41 @@ class VIEW3D_MT_view_align(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.item_booleanO("view3d.view_all", "center", True, text="Center Cursor and View All")
-        layout.itemO("view3d.camera_to_view", text="Align Active Camera to View")
-        layout.itemO("view3d.view_center")
+        layout.menu("VIEW3D_MT_view_align_selected")
+
+        layout.separator()
+
+        layout.operator("view3d.view_all", text="Center Cursor and View All").center = True
+        layout.operator("view3d.camera_to_view", text="Align Active Camera to View")
+        layout.operator("view3d.view_center")
+        layout.operator("view3d.view_center_cursor")
+
+
+class VIEW3D_MT_view_align_selected(bpy.types.Menu):
+    bl_label = "Align View to Selected"
+
+    def draw(self, context):
+        layout = self.layout
+
+        props = layout.operator("view3d.viewnumpad", text="Top")
+        props.align_active = True
+        props.type = 'TOP'
+        props = layout.operator("view3d.viewnumpad", text="Bottom")
+        props.align_active = True
+        props.type = 'BOTTOM'
+        props = layout.operator("view3d.viewnumpad", text="Front")
+        props.align_active = True
+        props.type = 'FRONT'
+        props = layout.operator("view3d.viewnumpad", text="Back")
+        props.align_active = True
+        props.type = 'BACK'
+        props = layout.operator("view3d.viewnumpad", text="Right")
+        props.align_active = True
+        props.type = 'RIGHT'
+        props = layout.operator("view3d.viewnumpad", text="Left")
+        props.align_active = True
+        props.type = 'LEFT'
+
 
 class VIEW3D_MT_view_cameras(bpy.types.Menu):
     bl_label = "Cameras"
@@ -168,29 +301,36 @@ class VIEW3D_MT_view_cameras(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.object_as_camera")
-        layout.item_enumO("view3d.viewnumpad", "type", 'CAMERA', text="Active Camera")
+        layout.operator("view3d.object_as_camera")
+        layout.operator("view3d.viewnumpad", text="Active Camera").type = 'CAMERA'
 
 # ********** Select menus, suffix from context.mode **********
 
+
 class VIEW3D_MT_select_object(bpy.types.Menu):
     bl_label = "Select"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border")
+        layout.operator("view3d.select_border")
+        layout.operator("view3d.select_circle")
+
+        layout.separator()
+
+        layout.operator("object.select_all_toggle", text="Select/Deselect All")
+        layout.operator("object.select_inverse", text="Inverse")
+        layout.operator("object.select_random", text="Random")
+        layout.operator("object.select_mirror", text="Mirror")
+        layout.operator("object.select_by_layer", text="Select All by Layer")
+        layout.operator_menu_enum("object.select_by_type", "type", "", text="Select All by Type...")
 
-        layout.itemS()
+        layout.separator()
+
+        layout.operator_menu_enum("object.select_grouped", "type", text="Grouped")
+        layout.operator_menu_enum("object.select_linked", "type", text="Linked")
+        layout.operator("object.select_pattern", text="Select Pattern...")
 
-        layout.itemO("object.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("object.select_inverse", text="Inverse")
-        layout.itemO("object.select_random", text="Random")
-        layout.itemO("object.select_mirror", text="Mirror")
-        layout.itemO("object.select_by_layer", text="Select All by Layer")
-        layout.item_menu_enumO("object.select_by_type", "type", "", text="Select All by Type...")
-        layout.item_menu_enumO("object.select_grouped", "type", text="Select Grouped...")
-        layout.itemO("object.select_pattern", text="Select Pattern...")
 
 class VIEW3D_MT_select_pose(bpy.types.Menu):
     bl_label = "Select"
@@ -198,47 +338,55 @@ class VIEW3D_MT_select_pose(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border", text="Border Select...")
+        layout.operator("view3d.select_border")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("pose.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("pose.select_inverse", text="Inverse")
-        layout.itemO("pose.select_constraint_target", text="Constraint Target")
-        layout.itemO("pose.select_linked", text="Linked")
+        layout.operator("pose.select_all_toggle", text="Select/Deselect All")
+        layout.operator("pose.select_inverse", text="Inverse")
+        layout.operator("pose.select_constraint_target", text="Constraint Target")
+        layout.operator("pose.select_linked", text="Linked")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_enumO("pose.select_hierarchy", "direction", 'PARENT')
-        layout.item_enumO("pose.select_hierarchy", "direction", 'CHILD')
+        layout.operator("pose.select_hierarchy", text="Parent").direction = 'PARENT'
+        layout.operator("pose.select_hierarchy", text="Child").direction = 'CHILD'
 
-        layout.itemS()
+        layout.separator()
 
-        props = layout.itemO("pose.select_hierarchy", properties=True, text="Extend Parent")
+        props = layout.operator("pose.select_hierarchy", text="Extend Parent")
         props.extend = True
         props.direction = 'PARENT'
 
-        props = layout.itemO("pose.select_hierarchy", properties=True, text="Extend Child")
+        props = layout.operator("pose.select_hierarchy", text="Extend Child")
         props.extend = True
         props.direction = 'CHILD'
 
+
 class VIEW3D_MT_select_particle(bpy.types.Menu):
     bl_label = "Select"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border")
+        layout.operator("view3d.select_border")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("particle.select_all_toggle", text="Select/Deselect All")
+        layout.operator("particle.select_linked")
+        layout.operator("particle.select_inverse")
 
-        layout.itemO("particle.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("particle.select_linked")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("particle.select_more")
+        layout.operator("particle.select_less")
+
+        layout.separator()
+
+        layout.operator("particle.select_first", text="Roots")
+        layout.operator("particle.select_last", text="Tips")
 
-        layout.itemO("particle.select_more")
-        layout.itemO("particle.select_less")
 
 class VIEW3D_MT_select_edit_mesh(bpy.types.Menu):
     bl_label = "Select"
@@ -246,44 +394,48 @@ class VIEW3D_MT_select_edit_mesh(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border", text="Border Select...")
+        layout.operator("view3d.select_border")
+        layout.operator("view3d.select_circle")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.select_all_toggle", text="Select/Deselect All")
+        layout.operator("mesh.select_inverse", text="Inverse")
 
-        layout.itemO("mesh.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("mesh.select_inverse", text="Inverse")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.select_random", text="Random...")
+        layout.operator("mesh.edges_select_sharp", text="Sharp Edges")
+        layout.operator("mesh.faces_select_linked_flat", text="Linked Flat Faces")
+        layout.operator("mesh.faces_select_interior", text="Interior Faces")
+        layout.operator("mesh.select_axis", text="Side of Active")
 
-        layout.itemO("mesh.select_random", text="Random...")
-        layout.itemO("mesh.edges_select_sharp", text="Sharp Edges")
-        layout.itemO("mesh.faces_select_linked_flat", text="Linked Flat Faces")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.select_by_number_vertices", text="Triangles").type = 'TRIANGLES'
+        layout.operator("mesh.select_by_number_vertices", text="Quads").type = 'QUADS'
+        layout.operator("mesh.select_by_number_vertices", text="Loose Verts/Edges").type = 'OTHER'
+        layout.operator("mesh.select_similar", text="Similar...")
 
-        layout.item_enumO("mesh.select_by_number_vertices", "type", 'TRIANGLES', text="Triangles")
-        layout.item_enumO("mesh.select_by_number_vertices", "type", 'QUADS', text="Quads")
-        layout.item_enumO("mesh.select_by_number_vertices", "type", 'OTHER', text="Loose Verts/Edges")
-        layout.itemO("mesh.select_similar", text="Similar...")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.select_less", text="Less")
+        layout.operator("mesh.select_more", text="More")
 
-        layout.itemO("mesh.select_less", text="Less")
-        layout.itemO("mesh.select_more", text="More")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.select_mirror", text="Mirror")
 
-        layout.itemO("mesh.select_mirror", text="Mirror")
+        layout.operator("mesh.select_linked", text="Linked")
+        layout.operator("mesh.select_vertex_path", text="Vertex Path")
+        layout.operator("mesh.loop_multi_select", text="Edge Loop")
+        layout.operator("mesh.loop_multi_select", text="Edge Ring").ring = True
 
-        layout.itemO("mesh.select_linked", text="Linked")
-        layout.itemO("mesh.select_vertex_path", text="Vertex Path")
-        layout.itemO("mesh.loop_multi_select", text="Edge Loop")
-        layout.item_booleanO("mesh.loop_multi_select", "ring", True, text="Edge Ring")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mesh.loop_to_region")
+        layout.operator("mesh.region_to_loop")
 
-        layout.itemO("mesh.loop_to_region")
-        layout.itemO("mesh.region_to_loop")
 
 class VIEW3D_MT_select_edit_curve(bpy.types.Menu):
     bl_label = "Select"
@@ -291,27 +443,28 @@ class VIEW3D_MT_select_edit_curve(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border", text="Border Select...")
-        layout.itemO("view3d.select_circle", text="Circle Select...")
+        layout.operator("view3d.select_border")
+        layout.operator("view3d.select_circle")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("curve.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("curve.select_inverse")
-        layout.itemO("curve.select_random")
-        layout.itemO("curve.select_every_nth")
+        layout.operator("curve.select_all_toggle", text="Select/Deselect All")
+        layout.operator("curve.select_inverse")
+        layout.operator("curve.select_random")
+        layout.operator("curve.select_every_nth")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("curve.de_select_first")
-        layout.itemO("curve.de_select_last")
-        layout.itemO("curve.select_next")
-        layout.itemO("curve.select_previous")
+        layout.operator("curve.de_select_first")
+        layout.operator("curve.de_select_last")
+        layout.operator("curve.select_next")
+        layout.operator("curve.select_previous")
 
-        layout.itemS()
+        layout.separator()
+
+        layout.operator("curve.select_more")
+        layout.operator("curve.select_less")
 
-        layout.itemO("curve.select_more")
-        layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_edit_surface(bpy.types.Menu):
     bl_label = "Select"
@@ -319,24 +472,25 @@ class VIEW3D_MT_select_edit_surface(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border", text="Border Select...")
-        layout.itemO("view3d.select_circle", text="Circle Select...")
+        layout.operator("view3d.select_border")
+        layout.operator("view3d.select_circle")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("curve.select_all_toggle", text="Select/Deselect All")
+        layout.operator("curve.select_inverse")
+        layout.operator("curve.select_random")
+        layout.operator("curve.select_every_nth")
 
-        layout.itemO("curve.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("curve.select_inverse")
-        layout.itemO("curve.select_random")
-        layout.itemO("curve.select_every_nth")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("curve.select_row")
 
-        layout.itemO("curve.select_row")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("curve.select_more")
+        layout.operator("curve.select_less")
 
-        layout.itemO("curve.select_more")
-        layout.itemO("curve.select_less")
 
 class VIEW3D_MT_select_edit_metaball(bpy.types.Menu):
     bl_label = "Select"
@@ -344,16 +498,17 @@ class VIEW3D_MT_select_edit_metaball(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border")
+        layout.operator("view3d.select_border")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mball.select_deselect_all_metaelems")
+        layout.operator("mball.select_inverse_metaelems")
 
-        layout.itemO("mball.select_deselect_all_metaelems")
-        layout.itemO("mball.select_inverse_metaelems")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mball.select_random_metaelems")
 
-        layout.itemO("mball.select_random_metaelems")
 
 class VIEW3D_MT_select_edit_lattice(bpy.types.Menu):
     bl_label = "Select"
@@ -361,11 +516,12 @@ class VIEW3D_MT_select_edit_lattice(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border")
+        layout.operator("view3d.select_border")
 
-        layout.itemS()
+        layout.separator()
+
+        layout.operator("lattice.select_all_toggle", text="Select/Deselect All")
 
-        layout.itemO("lattice.select_all_toggle", text="Select/Deselect All")
 
 class VIEW3D_MT_select_edit_armature(bpy.types.Menu):
     bl_label = "Select"
@@ -373,38 +529,42 @@ class VIEW3D_MT_select_edit_armature(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("view3d.select_border", text="Border Select...")
+        layout.operator("view3d.select_border")
+
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("armature.select_all_toggle", text="Select/Deselect All")
-        layout.itemO("armature.select_inverse", text="Inverse")
+        layout.operator("armature.select_all_toggle", text="Select/Deselect All")
+        layout.operator("armature.select_inverse", text="Inverse")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_enumO("armature.select_hierarchy", "direction", 'PARENT', text="Parent")
-        layout.item_enumO("armature.select_hierarchy", "direction", 'CHILD', text="Child")
+        layout.operator("armature.select_hierarchy", text="Parent").direction = 'PARENT'
+        layout.operator("armature.select_hierarchy", text="Child").direction = 'CHILD'
 
-        layout.itemS()
+        layout.separator()
 
-        props = layout.itemO("armature.select_hierarchy", properties=True, text="Extend Parent")
+        props = layout.operator("armature.select_hierarchy", text="Extend Parent")
         props.extend = True
         props.direction = 'PARENT'
 
-        props = layout.itemO("armature.select_hierarchy", properties=True, text="Extend Child")
+        props = layout.operator("armature.select_hierarchy", text="Extend Child")
         props.extend = True
         props.direction = 'CHILD'
 
+
 class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum
     bl_label = "Select"
 
     def draw(self, context):
         layout = self.layout
-
-        layout.view3d_select_faceselmenu()
+        
+        # TODO
+        # see view3d_select_faceselmenu
 
 # ********** Object menu **********
 
+
 class VIEW3D_MT_object(bpy.types.Menu):
     bl_context = "objectmode"
     bl_label = "Object"
@@ -412,41 +572,47 @@ class VIEW3D_MT_object(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemM("VIEW3D_MT_object_clear")
-        layout.itemM("VIEW3D_MT_object_apply")
-        layout.itemM("VIEW3D_MT_snap")
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.menu("VIEW3D_MT_object_clear")
+        layout.menu("VIEW3D_MT_object_apply")
+        layout.menu("VIEW3D_MT_snap")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
-        layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
+        layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
+        layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("object.duplicate_move")
-        layout.item_booleanO("object.duplicate", "linked", True, text="Duplicate Linked")
-        layout.itemO("object.delete", text="Delete...")
-        layout.itemO("object.proxy_make", text="Make Proxy...")
-        layout.item_menu_enumO("object.make_local", "type", text="Make Local...")
-        layout.itemM("VIEW3D_MT_make_single_user")
+        layout.operator("object.duplicate_move")
+        layout.operator("object.duplicate", text="Duplicate Linked").linked = True
+        layout.operator("object.delete", text="Delete...")
+        layout.operator("object.proxy_make", text="Make Proxy...")
+        layout.menu("VIEW3D_MT_make_links", text="Make Links...")
+        layout.operator_menu_enum("object.make_local", "type", text="Make Local...")
+        layout.menu("VIEW3D_MT_make_single_user")
+        layout.menu("VIEW3D_MT_make_links")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemM("VIEW3D_MT_object_parent")
-        layout.itemM("VIEW3D_MT_object_track")
-        layout.itemM("VIEW3D_MT_object_group")
-        layout.itemM("VIEW3D_MT_object_constraints")
+        layout.menu("VIEW3D_MT_object_parent")
+        layout.menu("VIEW3D_MT_object_track")
+        layout.menu("VIEW3D_MT_object_group")
+        layout.menu("VIEW3D_MT_object_constraints")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("object.join")
+        layout.operator("object.join_shapes")
+        layout.operator("object.join")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("object.move_to_layer", text="Move to Layer...")
-        layout.itemM("VIEW3D_MT_object_showhide")
+        layout.operator("object.move_to_layer", text="Move to Layer...")
+        layout.menu("VIEW3D_MT_object_showhide")
+
+        layout.operator_menu_enum("object.convert", "target")
 
-        layout.item_menu_enumO("object.convert", "target")
 
 class VIEW3D_MT_object_clear(bpy.types.Menu):
     bl_label = "Clear"
@@ -454,10 +620,11 @@ class VIEW3D_MT_object_clear(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.location_clear", text="Location")
-        layout.itemO("object.rotation_clear", text="Rotation")
-        layout.itemO("object.scale_clear", text="Scale")
-        layout.itemO("object.origin_clear", text="Origin")
+        layout.operator("object.location_clear", text="Location")
+        layout.operator("object.rotation_clear", text="Rotation")
+        layout.operator("object.scale_clear", text="Scale")
+        layout.operator("object.origin_clear", text="Origin")
+
 
 class VIEW3D_MT_object_apply(bpy.types.Menu):
     bl_label = "Apply"
@@ -465,12 +632,12 @@ class VIEW3D_MT_object_apply(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.location_apply", text="Location")
-        layout.itemO("object.rotation_apply", text="Rotation")
-        layout.itemO("object.scale_apply", text="Scale")
-        layout.itemS()
-        layout.itemO("object.visual_transform_apply", text="Visual Transform")
-        layout.itemO("object.duplicates_make_real")
+        layout.operator("object.location_apply", text="Location")
+        layout.operator("object.rotation_apply", text="Rotation")
+        layout.operator("object.scale_apply", text="Scale")
+        layout.separator()
+        layout.operator("object.visual_transform_apply", text="Visual Transform")
+        layout.operator("object.duplicates_make_real")
 
 
 class VIEW3D_MT_object_parent(bpy.types.Menu):
@@ -479,8 +646,9 @@ class VIEW3D_MT_object_parent(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.parent_set", text="Set")
-        layout.itemO("object.parent_clear", text="Clear")
+        layout.operator("object.parent_set", text="Set")
+        layout.operator("object.parent_clear", text="Clear")
+
 
 class VIEW3D_MT_object_track(bpy.types.Menu):
     bl_label = "Track"
@@ -488,8 +656,9 @@ class VIEW3D_MT_object_track(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.track_set", text="Set")
-        layout.itemO("object.track_clear", text="Clear")
+        layout.operator("object.track_set", text="Set")
+        layout.operator("object.track_clear", text="Clear")
+
 
 class VIEW3D_MT_object_group(bpy.types.Menu):
     bl_label = "Group"
@@ -497,13 +666,14 @@ class VIEW3D_MT_object_group(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("group.group_create")
-        layout.itemO("group.objects_remove")
+        layout.operator("group.create")
+        layout.operator("group.objects_remove")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("group.objects_add_active")
+        layout.operator("group.objects_remove_active")
 
-        layout.itemO("group.objects_add_active")
-        layout.itemO("group.objects_remove_active")
 
 class VIEW3D_MT_object_constraints(bpy.types.Menu):
     bl_label = "Constraints"
@@ -511,8 +681,9 @@ class VIEW3D_MT_object_constraints(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.constraint_add_with_targets")
-        layout.itemO("object.constraints_clear")
+        layout.operator("object.constraint_add_with_targets")
+        layout.operator("object.constraints_clear")
+
 
 class VIEW3D_MT_object_showhide(bpy.types.Menu):
     bl_label = "Show/Hide"
@@ -520,9 +691,10 @@ class VIEW3D_MT_object_showhide(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("object.restrictview_clear", text="Show Hidden")
-        layout.itemO("object.restrictview_set", text="Hide Selected")
-        layout.item_booleanO("object.restrictview_set", "unselected", True, text="Hide Unselected")
+        layout.operator("object.restrictview_clear", text="Show Hidden")
+        layout.operator("object.restrictview_set", text="Hide Selected")
+        layout.operator("object.restrictview_set", text="Hide Unselected").unselected = True
+
 
 class VIEW3D_MT_make_single_user(bpy.types.Menu):
     bl_label = "Make Single User"
@@ -530,37 +702,91 @@ class VIEW3D_MT_make_single_user(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        props = layout.itemO("object.make_single_user", properties=True, text="Object")
+        props = layout.operator("object.make_single_user", text="Object")
         props.object = True
 
-        props = layout.itemO("object.make_single_user", properties=True, text="Object & ObData")
+        props = layout.operator("object.make_single_user", text="Object & ObData")
         props.object = props.obdata = True
 
-        props = layout.itemO("object.make_single_user", properties=True, text="Object & ObData & Materials+Tex")
+        props = layout.operator("object.make_single_user", text="Object & ObData & Materials+Tex")
         props.object = props.obdata = props.material = props.texture = True
 
-        props = layout.itemO("object.make_single_user", properties=True, text="Materials+Tex")
+        props = layout.operator("object.make_single_user", text="Materials+Tex")
         props.material = props.texture = True
 
-        props = layout.itemO("object.make_single_user", properties=True, text="Animation")
+        props = layout.operator("object.make_single_user", text="Animation")
         props.animation = True
 
+
+class VIEW3D_MT_make_links(bpy.types.Menu):
+    bl_label = "Make Links"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator_menu_enum("object.make_links_scene", "type", text="Objects to Scene...")
+
+        layout.operator_enums("object.make_links_data", property="type") # inline
+
+
 # ********** Vertex paint menu **********
 
+
 class VIEW3D_MT_paint_vertex(bpy.types.Menu):
     bl_label = "Paint"
 
     def draw(self, context):
         layout = self.layout
 
-        sculpt = context.tool_settings.sculpt
+        layout.operator("paint.vertex_color_set")
+        layout.operator("paint.vertex_color_set", text="Set Selected Vertex Colors").selected = True
+
+
+class VIEW3D_MT_hook(bpy.types.Menu):
+    bl_label = "Hooks"
+
+    def draw(self, context):
+        layout = self.layout
+        layout.operator_context = 'EXEC_AREA'
+        layout.operator("object.hook_add_newob")
+        layout.operator("object.hook_add_selob")
+        
+        if [mod.type == 'HOOK' for mod in context.active_object.modifiers]:
+            layout.separator()
+            layout.operator_menu_enum("object.hook_assign", "modifier")
+            layout.operator_menu_enum("object.hook_remove", "modifier")
+            layout.separator()
+            layout.operator_menu_enum("object.hook_select", "modifier")
+            layout.operator_menu_enum("object.hook_reset", "modifier")
+            layout.operator_menu_enum("object.hook_recenter", "modifier")
+
+
+class VIEW3D_MT_vertex_group(bpy.types.Menu):
+    bl_label = "Vertex Groups"
+
+    def draw(self, context):
+        layout = self.layout
+        layout.operator_context = 'EXEC_AREA'
+        layout.operator("object.vertex_group_assign", text="Assign to New Group").new = True
+        
+        ob = context.active_object
+        if ob.mode == 'EDIT':
+            if ob.vertex_groups and ob.active_vertex_group:
+                layout.separator()
+                layout.operator("object.vertex_group_assign", text="Assign to Active Group")
+                layout.operator("object.vertex_group_remove_from", text="Remove from Active Group")
+                layout.operator("object.vertex_group_remove_from", text="Remove from All").all = True
+                layout.separator()
+        
+        if ob.vertex_groups and ob.active_vertex_group:
+            layout.operator_menu_enum("object.vertex_group_set_active", "group", text="Set Active Group")
+            layout.operator("object.vertex_group_remove", text="Remove Active Group")
+            layout.operator("object.vertex_group_remove", text="Remove All Groups").all = True
 
-        layout.itemO("paint.vertex_color_set")
-        props = layout.itemO("paint.vertex_color_set", text="Set Selected Vertex Colors", properties=True)
-        props.selected = True
 
 # ********** Sculpt menu **********
 
+
 class VIEW3D_MT_sculpt(bpy.types.Menu):
     bl_label = "Sculpt"
 
@@ -570,32 +796,35 @@ class VIEW3D_MT_sculpt(bpy.types.Menu):
         sculpt = context.tool_settings.sculpt
         brush = context.tool_settings.sculpt.brush
 
-        layout.itemR(sculpt, "symmetry_x")
-        layout.itemR(sculpt, "symmetry_y")
-        layout.itemR(sculpt, "symmetry_z")
-        layout.itemS()
-        layout.itemR(sculpt, "lock_x")
-        layout.itemR(sculpt, "lock_y")
-        layout.itemR(sculpt, "lock_z")
-        layout.itemS()
-        layout.item_menu_enumO("brush.curve_preset", property="shape")
-        layout.itemS()
+        layout.prop(sculpt, "symmetry_x")
+        layout.prop(sculpt, "symmetry_y")
+        layout.prop(sculpt, "symmetry_z")
+        layout.separator()
+        layout.prop(sculpt, "lock_x")
+        layout.prop(sculpt, "lock_y")
+        layout.prop(sculpt, "lock_z")
+        layout.separator()
+        layout.operator_menu_enum("brush.curve_preset", property="shape")
+        layout.separator()
+
+        sculpt_tool = brush.sculpt_tool
 
-        if brush.sculpt_tool != 'GRAB':
-            layout.itemR(brush, "use_airbrush")
+        if sculpt_tool != 'GRAB':
+            layout.prop(brush, "use_airbrush")
 
-            if brush.sculpt_tool != 'LAYER':
-                layout.itemR(brush, "use_anchor")
+            if sculpt_tool != 'LAYER':
+                layout.prop(brush, "use_anchor")
 
-            if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
-                layout.itemR(brush, "flip_direction")
+            if sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'):
+                layout.prop(brush, "flip_direction")
 
-            if brush.sculpt_tool == 'LAYER':
-                layout.itemR(brush, "use_persistent")
-                layout.itemO("sculpt.set_persistent_base")
+            if sculpt_tool == 'LAYER':
+                layout.prop(brush, "use_persistent")
+                layout.operator("sculpt.set_persistent_base")
 
 # ********** Particle menu **********
 
+
 class VIEW3D_MT_particle(bpy.types.Menu):
     bl_label = "Particle"
 
@@ -604,27 +833,29 @@ class VIEW3D_MT_particle(bpy.types.Menu):
 
         particle_edit = context.tool_settings.particle_edit
 
-        layout.itemO("particle.mirror")
+        layout.operator("particle.mirror")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("particle.remove_doubles")
-        layout.itemO("particle.delete")
+        layout.operator("particle.remove_doubles")
+        layout.operator("particle.delete")
 
         if particle_edit.selection_mode == 'POINT':
-            layout.itemO("particle.subdivide")
+            layout.operator("particle.subdivide")
+
+        layout.operator("particle.rekey")
 
-        layout.itemO("particle.rekey")
+        layout.separator()
 
-        layout.itemS()
+        layout.menu("VIEW3D_MT_particle_showhide")
 
-        layout.itemM("VIEW3D_MT_particle_showhide")
 
 class VIEW3D_MT_particle_showhide(VIEW3D_MT_showhide):
     _operator_name = "particle"
 
 # ********** Pose Menu **********
 
+
 class VIEW3D_MT_pose(bpy.types.Menu):
     bl_label = "Pose"
 
@@ -632,57 +863,61 @@ class VIEW3D_MT_pose(bpy.types.Menu):
         layout = self.layout
 
         arm = context.active_object.data
-
+        
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_snap")
         if arm.drawtype in ('BBONE', 'ENVELOPE'):
-            layout.item_enumO("tfm.transform", "mode", 'BONESIZE', text="Scale Envelope Distance")
+            layout.operator("tfm.transform", text="Scale Envelope Distance").mode = 'BONESIZE'
+
+        layout.menu("VIEW3D_MT_pose_transform")
 
-        layout.itemM("VIEW3D_MT_pose_transform")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
+        layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
 
-        layout.itemO("anim.insert_keyframe_menu", text="Insert Keyframe...")
-        layout.itemO("anim.delete_keyframe_v3d", text="Delete Keyframe...")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("pose.apply")
+        layout.operator("pose.relax")
 
-        layout.itemO("pose.apply")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("pose.copy")
+        layout.operator("pose.paste")
+        layout.operator("pose.paste", text="Paste X-Flipped Pose").flipped = True
 
-        layout.itemO("pose.copy")
-        layout.itemO("pose.paste")
-        layout.item_booleanO("pose.paste", "flipped", True, text="Paste X-Flipped Pose")
+        layout.separator()
 
-        layout.itemS()
+        layout.menu("VIEW3D_MT_pose_pose")
+        layout.menu("VIEW3D_MT_pose_motion")
+        layout.menu("VIEW3D_MT_pose_group")
 
-        layout.itemM("VIEW3D_MT_pose_pose")
-        layout.itemM("VIEW3D_MT_pose_motion")
-        layout.itemM("VIEW3D_MT_pose_group")
+        layout.separator()
 
-        layout.itemS()
+        layout.menu("VIEW3D_MT_pose_ik")
+        layout.menu("VIEW3D_MT_pose_constraints")
 
-        layout.itemM("VIEW3D_MT_pose_ik")
-        layout.itemM("VIEW3D_MT_pose_constraints")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator_context = 'EXEC_AREA'
+        layout.operator("pose.autoside_names", text="AutoName Left/Right").axis = 'XAXIS'
+        layout.operator("pose.autoside_names", text="AutoName Front/Back").axis = 'YAXIS'
+        layout.operator("pose.autoside_names", text="AutoName Top/Bottom").axis = 'ZAXIS'
 
-        layout.operator_context = "EXEC_AREA"
-        layout.item_enumO("pose.autoside_names", "axis", 'XAXIS', text="AutoName Left/Right")
-        layout.item_enumO("pose.autoside_names", "axis", 'YAXIS', text="AutoName Front/Back")
-        layout.item_enumO("pose.autoside_names", "axis", 'ZAXIS', text="AutoName Top/Bottom")
+        layout.operator("pose.flip_names")
 
-        layout.itemO("pose.flip_names")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator_context = 'INVOKE_AREA'
+        layout.operator("pose.armature_layers", text="Change Armature Layers...")
+        layout.operator("pose.bone_layers", text="Change Bone Layers...")
 
-        layout.operator_context = "INVOKE_AREA"
-        layout.itemO("pose.armature_layers", text="Change Armature Layers...")
-        layout.itemO("pose.bone_layers", text="Change Bone Layers...")
+        layout.separator()
 
-        layout.itemS()
+        layout.menu("VIEW3D_MT_pose_showhide")
+        layout.operator_menu_enum("pose.flags_set", 'mode', text="Bone Settings")
 
-        layout.itemM("VIEW3D_MT_pose_showhide")
-        layout.item_menu_enumO("pose.flags_set", 'mode', text="Bone Settings")
 
 class VIEW3D_MT_pose_transform(bpy.types.Menu):
     bl_label = "Clear Transform"
@@ -690,13 +925,14 @@ class VIEW3D_MT_pose_transform(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemL(text="User Transform")
+        layout.label(text="User Transform")
 
-        layout.itemO("pose.loc_clear", text="Location")
-        layout.itemO("pose.rot_clear", text="Rotation")
-        layout.itemO("pose.scale_clear", text="Scale")
+        layout.operator("pose.loc_clear", text="Location")
+        layout.operator("pose.rot_clear", text="Rotation")
+        layout.operator("pose.scale_clear", text="Scale")
+
+        layout.label(text="Origin")
 
-        layout.itemL(text="Origin")
 
 class VIEW3D_MT_pose_pose(bpy.types.Menu):
     bl_label = "Pose Library"
@@ -704,13 +940,14 @@ class VIEW3D_MT_pose_pose(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("poselib.browse_interactive", text="Browse Poses...")
+        layout.operator("poselib.browse_interactive", text="Browse Poses...")
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("poselib.pose_add", text="Add Pose...")
+        layout.operator("poselib.pose_rename", text="Rename Pose...")
+        layout.operator("poselib.pose_remove", text="Remove Pose...")
 
-        layout.itemO("poselib.pose_add", text="Add Pose...")
-        layout.itemO("poselib.pose_rename", text="Rename Pose...")
-        layout.itemO("poselib.pose_remove", text="Remove Pose...")
 
 class VIEW3D_MT_pose_motion(bpy.types.Menu):
     bl_label = "Motion Paths"
@@ -718,21 +955,22 @@ class VIEW3D_MT_pose_motion(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("pose.paths_calculate", text="Calculate")
-        layout.itemO("pose.paths_clear", text="Clear")
+        layout.operator("pose.paths_calculate", text="Calculate")
+        layout.operator("pose.paths_clear", text="Clear")
+
 
 class VIEW3D_MT_pose_group(bpy.types.Menu):
     bl_label = "Bone Groups"
 
     def draw(self, context):
         layout = self.layout
-        layout.itemO("pose.group_add")
-        layout.itemO("pose.group_remove")
+        layout.operator("pose.group_add")
+        layout.operator("pose.group_remove")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("pose.group_assign")
-        layout.itemO("pose.group_unassign")
+        layout.operator("pose.group_assign")
+        layout.operator("pose.group_unassign")
 
 
 class VIEW3D_MT_pose_ik(bpy.types.Menu):
@@ -741,8 +979,9 @@ class VIEW3D_MT_pose_ik(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("pose.ik_add")
-        layout.itemO("pose.ik_clear")
+        layout.operator("pose.ik_add")
+        layout.operator("pose.ik_clear")
+
 
 class VIEW3D_MT_pose_constraints(bpy.types.Menu):
     bl_label = "Constraints"
@@ -750,15 +989,16 @@ class VIEW3D_MT_pose_constraints(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("pose.constraint_add_with_targets", text="Add (With Targets)...")
-        layout.itemO("pose.constraints_clear")
+        layout.operator("pose.constraint_add_with_targets", text="Add (With Targets)...")
+        layout.operator("pose.constraints_clear")
+
 
 class VIEW3D_MT_pose_showhide(VIEW3D_MT_showhide):
     _operator_name = "pose"
 
 # ********** Edit Menus, suffix from ob.type **********
 
-# Edit MESH
+
 class VIEW3D_MT_edit_mesh(bpy.types.Menu):
     bl_label = "Mesh"
 
@@ -767,41 +1007,43 @@ class VIEW3D_MT_edit_mesh(bpy.types.Menu):
 
         settings = context.tool_settings
 
-        layout.itemO("ed.undo")
-        layout.itemO("ed.redo")
+        layout.operator("ed.undo")
+        layout.operator("ed.redo")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemM("VIEW3D_MT_snap")
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.menu("VIEW3D_MT_snap")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("uv.mapping_menu", text="UV Unwrap...")
+        layout.menu("VIEW3D_MT_uv_map", text="UV Unwrap...")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.extrude_move")
-        layout.itemO("mesh.duplicate_move")
-        layout.itemO("mesh.delete", text="Delete...")
+        layout.operator("mesh.extrude_move")
+        layout.operator("mesh.duplicate_move")
+        layout.operator("mesh.delete", text="Delete...")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemM("VIEW3D_MT_edit_mesh_vertices")
-        layout.itemM("VIEW3D_MT_edit_mesh_edges")
-        layout.itemM("VIEW3D_MT_edit_mesh_faces")
-        layout.itemM("VIEW3D_MT_edit_mesh_normals")
+        layout.menu("VIEW3D_MT_edit_mesh_vertices")
+        layout.menu("VIEW3D_MT_edit_mesh_edges")
+        layout.menu("VIEW3D_MT_edit_mesh_faces")
+        layout.menu("VIEW3D_MT_edit_mesh_normals")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemR(settings, "automerge_editing")
-        layout.item_menu_enumR(settings, "proportional_editing")
-        layout.item_menu_enumR(settings, "proportional_editing_falloff")
+        layout.prop(settings, "automerge_editing")
+        layout.prop_menu_enum(settings, "proportional_editing")
+        layout.prop_menu_enum(settings, "proportional_editing_falloff")
 
-        layout.itemS()
+        layout.separator()
+
+        layout.menu("VIEW3D_MT_edit_mesh_showhide")
 
-        layout.itemM("VIEW3D_MT_edit_mesh_showhide")
 
-# Only used by the menu
 class VIEW3D_MT_edit_mesh_specials(bpy.types.Menu):
     bl_label = "Specials"
 
@@ -810,21 +1052,22 @@ class VIEW3D_MT_edit_mesh_specials(bpy.types.Menu):
 
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.itemO("mesh.subdivide", text="Subdivide")
-        layout.item_floatO("mesh.subdivide", "smoothness", 1.0, text="Subdivide Smooth")
-        layout.itemO("mesh.merge", text="Merge...")
-        layout.itemO("mesh.remove_doubles")
-        layout.itemO("mesh.hide", text="Hide")
-        layout.itemO("mesh.reveal", text="Reveal")
-        layout.itemO("mesh.select_inverse")
-        layout.itemO("mesh.flip_normals")
-        layout.itemO("mesh.vertices_smooth", text="Smooth")
-        # layout.itemO("mesh.bevel", text="Bevel")
-        layout.itemO("mesh.faces_shade_smooth")
-        layout.itemO("mesh.faces_shade_flat")
-        layout.itemO("mesh.blend_from_shape")
-        layout.itemO("mesh.shape_propagate_to_all")
-        layout.itemO("mesh.select_vertex_path")
+        layout.operator("mesh.subdivide", text="Subdivide")
+        layout.operator("mesh.subdivide", text="Subdivide Smooth").smoothness = 1.0
+        layout.operator("mesh.merge", text="Merge...")
+        layout.operator("mesh.remove_doubles")
+        layout.operator("mesh.hide", text="Hide")
+        layout.operator("mesh.reveal", text="Reveal")
+        layout.operator("mesh.select_inverse")
+        layout.operator("mesh.flip_normals")
+        layout.operator("mesh.vertices_smooth", text="Smooth")
+        # layout.operator("mesh.bevel", text="Bevel")
+        layout.operator("mesh.faces_shade_smooth")
+        layout.operator("mesh.faces_shade_flat")
+        layout.operator("mesh.blend_from_shape")
+        layout.operator("mesh.shape_propagate_to_all")
+        layout.operator("mesh.select_vertex_path")
+
 
 class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu):
     bl_label = "Vertices"
@@ -833,22 +1076,28 @@ class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.itemO("mesh.merge")
-        layout.itemO("mesh.rip")
-        layout.itemO("mesh.split")
-        layout.itemO("mesh.separate")
+        layout.operator("mesh.merge")
+        layout.operator("mesh.rip")
+        layout.operator("mesh.split")
+        layout.operator("mesh.separate")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.vertices_smooth")
-        layout.itemO("mesh.remove_doubles")
+        layout.operator("mesh.vertices_smooth")
+        layout.operator("mesh.remove_doubles")
 
-        layout.itemO("mesh.select_vertex_path")
+        layout.operator("mesh.select_vertex_path")
 
-        layout.itemO("mesh.blend_from_shape")
+        layout.operator("mesh.blend_from_shape")
+
+        layout.operator("object.vertex_group_blend")
+        layout.operator("mesh.shape_propagate_to_all")
+
+        layout.separator()
+
+        layout.menu("VIEW3D_MT_vertex_group")
+        layout.menu("VIEW3D_MT_hook")
 
-        layout.itemO("object.vertex_group_blend")
-        layout.itemO("mesh.shape_propagate_to_all")
 
 class VIEW3D_MT_edit_mesh_edges(bpy.types.Menu):
     bl_label = "Edges"
@@ -857,36 +1106,36 @@ class VIEW3D_MT_edit_mesh_edges(bpy.types.Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.itemO("mesh.edge_face_add")
-        layout.itemO("mesh.subdivide")
+        layout.operator("mesh.edge_face_add")
+        layout.operator("mesh.subdivide")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.mark_seam")
-        layout.item_booleanO("mesh.mark_seam", "clear", True, text="Clear Seam")
+        layout.operator("mesh.mark_seam")
+        layout.operator("mesh.mark_seam", text="Clear Seam").clear = True
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.mark_sharp")
-        layout.item_booleanO("mesh.mark_sharp", "clear", True, text="Clear Sharp")
+        layout.operator("mesh.mark_sharp")
+        layout.operator("mesh.mark_sharp", text="Clear Sharp").clear = True
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_enumO("mesh.edge_rotate", "direction", 'CW', text="Rotate Edge CW")
-        layout.item_enumO("mesh.edge_rotate", "direction", 'CCW', text="Rotate Edge CCW")
+        layout.operator("mesh.edge_rotate", text="Rotate Edge CW").direction = 'CW'
+        layout.operator("mesh.edge_rotate", text="Rotate Edge CCW").direction = 'CCW'
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("TFM_OT_edge_slide", text="Edge Slide")
-        layout.itemO("mesh.loop_multi_select", text="Edge Loop")
+        layout.operator("TFM_OT_edge_slide", text="Edge Slide")
+        layout.operator("mesh.loop_multi_select", text="Edge Loop")
 
         # uiItemO(layout, "Loopcut", 0, "mesh.loop_cut"); // CutEdgeloop(em, 1);
         # uiItemO(layout, "Edge Slide", 0, "mesh.edge_slide"); // EdgeSlide(em, 0,0.0);
 
-        layout.item_booleanO("mesh.loop_multi_select", "ring", True, text="Edge Ring")
+        layout.operator("mesh.loop_multi_select", text="Edge Ring").ring = True
 
-        layout.itemO("mesh.loop_to_region")
-        layout.itemO("mesh.region_to_loop")
+        layout.operator("mesh.loop_to_region")
+        layout.operator("mesh.region_to_loop")
 
 
 class VIEW3D_MT_edit_mesh_faces(dynamic_menu.DynMenu):
@@ -897,37 +1146,36 @@ class VIEW3D_MT_edit_mesh_faces(dynamic_menu.DynMenu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.itemO("mesh.flip_normals")
-        # layout.itemO("mesh.bevel")
-        # layout.itemO("mesh.bevel")
-        layout.itemO("mesh.edge_face_add")
-        layout.itemO("mesh.fill")
-        layout.itemO("mesh.beauty_fill")
+        # layout.operator("mesh.bevel")
+        # layout.operator("mesh.bevel")
+        layout.operator("mesh.edge_face_add")
+        layout.operator("mesh.fill")
+        layout.operator("mesh.beauty_fill")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.quads_convert_to_tris")
-        layout.itemO("mesh.tris_convert_to_quads")
-        layout.itemO("mesh.edge_flip")
+        layout.operator("mesh.quads_convert_to_tris")
+        layout.operator("mesh.tris_convert_to_quads")
+        layout.operator("mesh.edge_flip")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("mesh.faces_shade_smooth")
-        layout.itemO("mesh.faces_shade_flat")
+        layout.operator("mesh.faces_shade_smooth")
+        layout.operator("mesh.faces_shade_flat")
 
-        layout.itemS()
+        layout.separator()
 
         # uiItemO(layout, NULL, 0, "mesh.face_mode"); // mesh_set_face_flags(em, 1);
         # uiItemBooleanO(layout, NULL, 0, "mesh.face_mode", "clear", 1); // mesh_set_face_flags(em, 0);
 
-        layout.item_enumO("mesh.edge_rotate", "direction", 'CW', text="Rotate Edge CW")
+        layout.operator("mesh.edge_rotate", text="Rotate Edge CW").direction = 'CW'
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_menu_enumO("mesh.uvs_rotate", "direction")
-        layout.item_menu_enumO("mesh.uvs_mirror", "axis")
-        layout.item_menu_enumO("mesh.colors_rotate", "direction")
-        layout.item_menu_enumO("mesh.colors_mirror", "axis")
+        layout.operator_menu_enum("mesh.uvs_rotate", "direction")
+        layout.operator_menu_enum("mesh.uvs_mirror", "axis")
+        layout.operator_menu_enum("mesh.colors_rotate", "direction")
+        layout.operator_menu_enum("mesh.colors_mirror", "axis")
 
 
 class VIEW3D_MT_edit_mesh_normals(bpy.types.Menu):
@@ -936,54 +1184,60 @@ class VIEW3D_MT_edit_mesh_normals(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("mesh.normals_make_consistent", text="Recalculate Outside")
-        layout.item_booleanO("mesh.normals_make_consistent", "inside", True, text="Recalculate Inside")
+        layout.operator("mesh.normals_make_consistent", text="Recalculate Outside")
+        layout.operator("mesh.normals_make_consistent", text="Recalculate Inside").inside = True
 
-        layout.itemS()
+        layout.separator()
+
+        layout.operator("mesh.flip_normals")
 
-        layout.itemO("mesh.flip_normals")
 
 class VIEW3D_MT_edit_mesh_showhide(VIEW3D_MT_showhide):
     _operator_name = "mesh"
 
 # Edit Curve
-
 # draw_curve is used by VIEW3D_MT_edit_curve and VIEW3D_MT_edit_surface
+
+
 def draw_curve(self, context):
     layout = self.layout
 
     settings = context.tool_settings
+    
+    layout.menu("VIEW3D_MT_transform")
+    layout.menu("VIEW3D_MT_mirror")
+    layout.menu("VIEW3D_MT_snap")
 
-    layout.itemM("VIEW3D_MT_snap")
+    layout.separator()
 
-    layout.itemS()
+    layout.operator("curve.extrude")
+    layout.operator("curve.duplicate")
+    layout.operator("curve.separate")
+    layout.operator("curve.make_segment")
+    layout.operator("curve.cyclic_toggle")
+    layout.operator("curve.delete", text="Delete...")
 
-    layout.itemO("curve.extrude")
-    layout.itemO("curve.duplicate")
-    layout.itemO("curve.separate")
-    layout.itemO("curve.make_segment")
-    layout.itemO("curve.cyclic_toggle")
-    layout.itemO("curve.delete", text="Delete...")
+    layout.separator()
 
-    layout.itemS()
+    layout.menu("VIEW3D_MT_edit_curve_ctrlpoints")
+    layout.menu("VIEW3D_MT_edit_curve_segments")
 
-    layout.itemM("VIEW3D_MT_edit_curve_ctrlpoints")
-    layout.itemM("VIEW3D_MT_edit_curve_segments")
+    layout.separator()
 
-    layout.itemS()
+    layout.prop_menu_enum(settings, "proportional_editing")
+    layout.prop_menu_enum(settings, "proportional_editing_falloff")
 
-    layout.itemR(settings, "proportional_editing")
-    layout.item_menu_enumR(settings, "proportional_editing_falloff")
+    layout.separator()
 
-    layout.itemS()
+    layout.menu("VIEW3D_MT_edit_curve_showhide")
 
-    layout.itemM("VIEW3D_MT_edit_curve_showhide")
 
 class VIEW3D_MT_edit_curve(bpy.types.Menu):
     bl_label = "Curve"
 
     draw = draw_curve
 
+
 class VIEW3D_MT_edit_curve_ctrlpoints(bpy.types.Menu):
     bl_label = "Control Points"
 
@@ -993,13 +1247,18 @@ class VIEW3D_MT_edit_curve_ctrlpoints(bpy.types.Menu):
         edit_object = context.edit_object
 
         if edit_object.type == 'CURVE':
-            layout.item_enumO("tfm.transform", "mode", 'TILT')
-            layout.itemO("curve.tilt_clear")
-            layout.itemO("curve.separate")
+            layout.operator("tfm.transform").mode = 'TILT'
+            layout.operator("curve.tilt_clear")
+            layout.operator("curve.separate")
+
+            layout.separator()
+
+            layout.operator_menu_enum("curve.handle_type_set", "type")
+
+            layout.separator()
 
-            layout.itemS()
+            layout.menu("VIEW3D_MT_hook")
 
-            layout.item_menu_enumO("curve.handle_type_set", "type")
 
 class VIEW3D_MT_edit_curve_segments(bpy.types.Menu):
     bl_label = "Segments"
@@ -1007,30 +1266,32 @@ class VIEW3D_MT_edit_curve_segments(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("curve.subdivide")
-        layout.itemO("curve.switch_direction")
+        layout.operator("curve.subdivide")
+        layout.operator("curve.switch_direction")
+
 
 class VIEW3D_MT_edit_curve_showhide(VIEW3D_MT_showhide):
     _operator_name = "curve"
 
-# Edit SURFACE
+
 class VIEW3D_MT_edit_surface(bpy.types.Menu):
     bl_label = "Surface"
 
     draw = draw_curve
 
-# Edit TEXT
+
 class VIEW3D_MT_edit_text(bpy.types.Menu):
     bl_label = "Text"
 
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("font.file_paste")
+        layout.operator("font.file_paste")
 
-        layout.itemS()
+        layout.separator()
+
+        layout.menu("VIEW3D_MT_edit_text_chars")
 
-        layout.itemm("view3d_mt_edit_text_chars")
 
 class VIEW3D_MT_edit_text_chars(bpy.types.Menu):
     bl_label = "Special Characters"
@@ -1038,34 +1299,34 @@ class VIEW3D_MT_edit_text_chars(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xA9'.decode(), text="Copyright|Alt C")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xAE'.decode(), text="Registered Trademark|Alt R")
+        layout.operator("font.text_insert", text="Copyright|Alt C").text = b'\xC2\xA9'.decode()
+        layout.operator("font.text_insert", text="Registered Trademark|Alt R").text = b'\xC2\xAE'.decode()
+
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("font.text_insert", text="Degree Sign|Alt G").text = b'\xC2\xB0'.decode()
+        layout.operator("font.text_insert", text="Multiplication Sign|Alt x").text = b'\xC3\x97'.decode()
+        layout.operator("font.text_insert", text="Circle|Alt .").text = b'\xC2\x8A'.decode()
+        layout.operator("font.text_insert", text="Superscript 1|Alt 1").text = b'\xC2\xB9'.decode()
+        layout.operator("font.text_insert", text="Superscript 2|Alt 2").text = b'\xC2\xB2'.decode()
+        layout.operator("font.text_insert", text="Superscript 3|Alt 3").text = b'\xC2\xB3'.decode()
+        layout.operator("font.text_insert", text="Double >>|Alt >").text = b'\xC2\xBB'.decode()
+        layout.operator("font.text_insert", text="Double <<|Alt <").text = b'\xC2\xAB'.decode()
+        layout.operator("font.text_insert", text="Promillage|Alt %").text = b'\xE2\x80\xB0'.decode()
 
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xB0'.decode(), text="Degree Sign|Alt G")
-        layout.item_stringO("font.text_insert", "text", b'\xC3\x97'.decode(), text="Multiplication Sign|Alt x")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\x8A'.decode(), text="Circle|Alt .")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xB9'.decode(), text="Superscript 1|Alt 1")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xB2'.decode(), text="Superscript 2|Alt 2")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xB3'.decode(), text="Superscript 3|Alt 3")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xBB'.decode(), text="Double >>|Alt >")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xAB'.decode(), text="Double <<|Alt <")
-        layout.item_stringO("font.text_insert", "text", b'\xE2\x80\xB0'.decode(), text="Promillage|Alt %")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("font.text_insert", text="Dutch Florin|Alt F").text = b'\xC2\xA4'.decode()
+        layout.operator("font.text_insert", text="British Pound|Alt L").text = b'\xC2\xA3'.decode()
+        layout.operator("font.text_insert", text="Japanese Yen|Alt Y").text = b'\xC2\xA5'.decode()
 
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xA4'.decode(), text="Dutch Florin|Alt F")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xA3'.decode(), text="British Pound|Alt L")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xA5'.decode(), text="Japanese Yen|Alt Y")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("font.text_insert", text="German S|Alt S").text = b'\xC3\x9F'.decode()
+        layout.operator("font.text_insert", text="Spanish Question Mark|Alt ?").text = b'\xC2\xBF'.decode()
+        layout.operator("font.text_insert", text="Spanish Exclamation Mark|Alt !").text = b'\xC2\xA1'.decode()
 
-        layout.item_stringO("font.text_insert", "text", b'\xC3\x9F'.decode(), text="German S|Alt S")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xBF'.decode(), text="Spanish Question Mark|Alt ?")
-        layout.item_stringO("font.text_insert", "text", b'\xC2\xA1'.decode(), text="Spanish Exclamation Mark|Alt !")
 
-# Edit META
 class VIEW3D_MT_edit_meta(bpy.types.Menu):
     bl_label = "Metaball"
 
@@ -1074,26 +1335,29 @@ class VIEW3D_MT_edit_meta(bpy.types.Menu):
 
         settings = context.tool_settings
 
-        layout.itemO("ed.undo")
-        layout.itemO("ed.redo")
+        layout.operator("ed.undo")
+        layout.operator("ed.redo")
 
-        layout.itemS()
+        layout.separator()
+        
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.menu("VIEW3D_MT_snap")
 
-        layout.itemM("VIEW3D_MT_snap")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("mball.delete_metaelems", text="Delete...")
+        layout.operator("mball.duplicate_metaelems")
 
-        layout.itemO("mball.delete_metaelems", text="Delete...")
-        layout.itemO("mball.duplicate_metaelems")
+        layout.separator()
 
-        layout.itemS()
+        layout.prop_menu_enum(settings, "proportional_editing")
+        layout.prop_menu_enum(settings, "proportional_editing_falloff")
 
-        layout.itemR(settings, "proportional_editing")
-        layout.item_menu_enumR(settings, "proportional_editing_falloff")
+        layout.separator()
 
-        layout.itemS()
+        layout.menu("VIEW3D_MT_edit_meta_showhide")
 
-        layout.itemM("VIEW3D_MT_edit_meta_showhide")
 
 class VIEW3D_MT_edit_meta_showhide(bpy.types.Menu):
     bl_label = "Show/Hide"
@@ -1101,11 +1365,11 @@ class VIEW3D_MT_edit_meta_showhide(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("mball.reveal_metaelems", text="Show Hidden")
-        layout.itemO("mball.hide_metaelems", text="Hide Selected")
-        layout.item_booleanO("mball.hide_metaelems", "unselected", True, text="Hide Unselected")
+        layout.operator("mball.reveal_metaelems", text="Show Hidden")
+        layout.operator("mball.hide_metaelems", text="Hide Selected")
+        layout.operator("mball.hide_metaelems", text="Hide Unselected").unselected = True
+
 
-# Edit LATTICE
 class VIEW3D_MT_edit_lattice(bpy.types.Menu):
     bl_label = "Lattice"
 
@@ -1113,19 +1377,21 @@ class VIEW3D_MT_edit_lattice(bpy.types.Menu):
         layout = self.layout
 
         settings = context.tool_settings
+        
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.menu("VIEW3D_MT_snap")
 
-        layout.itemM("VIEW3D_MT_snap")
+        layout.separator()
 
-        layout.itemS()
+        layout.operator("lattice.make_regular")
 
-        layout.itemO("lattice.make_regular")
+        layout.separator()
 
-        layout.itemS()
+        layout.prop_menu_enum(settings, "proportional_editing")
+        layout.prop_menu_enum(settings, "proportional_editing_falloff")
 
-        layout.itemR(settings, "proportional_editing")
-        layout.item_menu_enumR(settings, "proportional_editing_falloff")
 
-# Edit ARMATURE
 class VIEW3D_MT_edit_armature(bpy.types.Menu):
     bl_label = "Armature"
 
@@ -1134,54 +1400,77 @@ class VIEW3D_MT_edit_armature(bpy.types.Menu):
 
         edit_object = context.edit_object
         arm = edit_object.data
-
-        layout.itemM("VIEW3D_MT_snap")
-        layout.itemM("VIEW3D_MT_edit_armature_roll")
+        
+        layout.menu("VIEW3D_MT_transform")
+        layout.menu("VIEW3D_MT_mirror")
+        layout.menu("VIEW3D_MT_snap")
+        layout.menu("VIEW3D_MT_edit_armature_roll")
 
         if arm.drawtype == 'ENVELOPE':
-            layout.item_enumO("tfm.transform", "mode", 'BONESIZE', text="Scale Envelope Distance")
+            layout.operator("tfm.transform", text="Scale Envelope Distance").mode = 'BONESIZE'
         else:
-            layout.item_enumO("tfm.transform", "mode", 'BONESIZE', text="Scale B-Bone Width")
+            layout.operator("tfm.transform", text="Scale B-Bone Width").mode = 'BONESIZE'
+
+        layout.separator()
+
+        layout.operator("armature.extrude_move")
+
+        if arm.x_axis_mirror:
+            layout.operator("armature.extrude_forked")
+
+        layout.operator("armature.duplicate_move")
+        layout.operator("armature.merge")
+        layout.operator("armature.fill")
+        layout.operator("armature.delete")
+        layout.operator("armature.separate")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("armature.extrude_move")
+        layout.operator("armature.subdivide_multi", text="Subdivide")
+        layout.operator("armature.switch_direction", text="Switch Direction")
 
-# EXTRUDE FORKED DOESN'T WORK YET
-#              if arm.x_axis_mirror:
-#                      layout.item_booleanO("armature.extrude_move", "forked", True, text="Extrude Forked")
+        layout.separator()
 
-        layout.itemO("armature.duplicate_move")
-        layout.itemO("armature.merge")
-        layout.itemO("armature.fill")
-        layout.itemO("armature.delete")
-        layout.itemO("armature.separate")
+        layout.operator_context = 'EXEC_AREA'
+        layout.operator("armature.autoside_names", text="AutoName Left/Right").type = 'XAXIS'
+        layout.operator("armature.autoside_names", text="AutoName Front/Back").type = 'YAXIS'
+        layout.operator("armature.autoside_names", text="AutoName Top/Bottom").type = 'ZAXIS'
+        layout.operator("armature.flip_names")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.itemO("armature.subdivide_multi", text="Subdivide")
+        layout.operator_context = 'INVOKE_DEFAULT'
+        layout.operator("armature.armature_layers")
+        layout.operator("armature.bone_layers")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.operator_context = "EXEC_AREA"
-        layout.item_enumO("armature.autoside_names", "type", 'XAXIS', text="AutoName Left/Right")
-        layout.item_enumO("armature.autoside_names", "type", 'YAXIS', text="AutoName Front/Back")
-        layout.item_enumO("armature.autoside_names", "type", 'ZAXIS', text="AutoName Top/Bottom")
-        layout.itemO("armature.flip_names")
+        layout.menu("VIEW3D_MT_edit_armature_parent")
 
-        layout.itemS()
+        layout.separator()
 
-        layout.operator_context = "INVOKE_DEFAULT"
-        layout.itemO("armature.armature_layers")
-        layout.itemO("armature.bone_layers")
+        layout.operator_menu_enum("armature.flags_set", "mode", text="Bone Settings")
 
-        layout.itemS()
 
-        layout.itemM("VIEW3D_MT_edit_armature_parent")
+class VIEW3D_MT_armature_specials(bpy.types.Menu):
+    bl_label = "Specials"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator_context = 'INVOKE_REGION_WIN'
 
-        layout.itemS()
+        layout.operator("armature.subdivide_multi", text="Subdivide")
+        layout.operator("armature.switch_direction", text="Switch Direction")
+
+        layout.separator()
+
+        layout.operator_context = 'EXEC_REGION_WIN'
+        layout.operator("armature.autoside_names", text="AutoName Left/Right").type = 'XAXIS'
+        layout.operator("armature.autoside_names", text="AutoName Front/Back").type = 'YAXIS'
+        layout.operator("armature.autoside_names", text="AutoName Top/Bottom").type = 'ZAXIS'
+        layout.operator("armature.flip_names", text="Flip Names")
 
-        layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings")
 
 class VIEW3D_MT_edit_armature_parent(bpy.types.Menu):
     bl_label = "Parent"
@@ -1189,8 +1478,9 @@ class VIEW3D_MT_edit_armature_parent(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.itemO("armature.parent_set", text="Make")
-        layout.itemO("armature.parent_clear", text="Clear")
+        layout.operator("armature.parent_set", text="Make")
+        layout.operator("armature.parent_clear", text="Clear")
+
 
 class VIEW3D_MT_edit_armature_roll(bpy.types.Menu):
     bl_label = "Bone Roll"
@@ -1198,15 +1488,16 @@ class VIEW3D_MT_edit_armature_roll(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.item_enumO("armature.calculate_roll", "type", 'GLOBALUP', text="Clear Roll (Z-Axis Up)")
-        layout.item_enumO("armature.calculate_roll", "type", 'CURSOR', text="Roll to Cursor")
+        layout.operator("armature.calculate_roll", text="Clear Roll (Z-Axis Up)").type = 'GLOBALUP'
+        layout.operator("armature.calculate_roll", text="Roll to Cursor").type = 'CURSOR'
 
-        layout.itemS()
+        layout.separator()
 
-        layout.item_enumO("tfm.transform", "mode", 'BONE_ROLL', text="Set Roll")
+        layout.operator("tfm.transform", text="Set Roll").mode = 'BONE_ROLL'
 
 # ********** Panel **********
 
+
 class VIEW3D_PT_3dview_properties(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
@@ -1223,22 +1514,49 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel):
         scene = context.scene
 
         col = layout.column()
-        col.itemL(text="Camera:")
-        col.itemR(view, "camera", text="")
-        col.itemR(view, "lens")
+        col.label(text="Camera:")
+        col.prop(view, "camera", text="")
+        col.prop(view, "lens")
+        col.label(text="Lock to Object:")
+        col.prop(view, "lock_object", text="")
+        if view.lock_object and view.lock_object.type == 'ARMATURE':
+            col.prop_object(view, "lock_bone", view.lock_object.data, "bones", text="")
 
         col = layout.column(align=True)
-        col.itemL(text="Clip:")
-        col.itemR(view, "clip_start", text="Start")
-        col.itemR(view, "clip_end", text="End")
+        col.label(text="Clip:")
+        col.prop(view, "clip_start", text="Start")
+        col.prop(view, "clip_end", text="End")
 
-        col = layout.column(align=True)
-        col.itemL(text="Grid:")
-        col.itemR(view, "grid_lines", text="Lines")
-        col.itemR(view, "grid_spacing", text="Spacing")
-        col.itemR(view, "grid_subdivisions", text="Subdivisions")
 
-        layout.column().itemR(scene, "cursor_location", text="3D Cursor:")
+
+        layout.column().prop(scene, "cursor_location", text="3D Cursor:")
+        
+        
+
+
+class VIEW3D_PT_3dview_name(bpy.types.Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_label = "Item"
+
+    def poll(self, context):
+        return (context.space_data and context.active_object)
+
+    def draw(self, context):
+        layout = self.layout
+
+        ob = context.active_object
+        row = layout.row()
+        row.label(text="", icon='ICON_OBJECT_DATA')
+        row.prop(ob, "name", text="")
+
+        if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'):
+            bone = context.active_bone
+            if bone:
+                row = layout.row()
+                row.label(text="", icon='ICON_BONE_DATA')
+                row.prop(bone, "name", text="")
+
 
 class VIEW3D_PT_3dview_display(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1256,32 +1574,40 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel):
         view = context.space_data
         gs = context.scene.game_data
         ob = context.object
-
+        
         col = layout.column()
-        col.itemR(view, "display_floor", text="Grid Floor")
-        col.itemR(view, "display_x_axis", text="X Axis")
-        col.itemR(view, "display_y_axis", text="Y Axis")
-        col.itemR(view, "display_z_axis", text="Z Axis")
-        col.itemR(view, "outline_selected")
-        col.itemR(view, "all_object_centers")
-        col.itemR(view, "relationship_lines")
-        if ob and ob.type =='MESH':
-            mesh = context.active_object.data
-            col.itemR(mesh, "all_edges")
-
+        col.prop(view, "display_x_axis", text="X Axis")
+        col.prop(view, "display_y_axis", text="Y Axis")
+        col.prop(view, "display_z_axis", text="Z Axis")
+        col.prop(view, "outline_selected")
+        col.prop(view, "all_object_centers")
+        col.prop(view, "relationship_lines")
+        if ob and ob.type == 'MESH':
+            mesh = ob.data
+            col.prop(mesh, "all_edges")
+        
+        col = layout.column()
+        col.prop(view, "display_floor", text="Grid Floor")
+        sub = col.column(align=True)
+        sub.active = view.display_floor
+        sub.prop(view, "grid_lines", text="Lines")
+        sub.prop(view, "grid_spacing", text="Spacing")
+        sub.prop(view, "grid_subdivisions", text="Subdivisions")
+        
         col = layout.column()
-        col.itemL(text="Shading:")
-        col.itemR(gs, "material_mode", text="")
-        col.itemR(view, "textured_solid")
+        col.label(text="Shading:")
+        col.prop(gs, "material_mode", text="")
+        col.prop(view, "textured_solid")
 
 # XXX - the Quad View options don't work yet
-#              layout.itemS()
+#              layout.separator()
 #
-#              layout.itemO("screen.region_foursplit", text="Toggle Quad View")
+#              layout.operator("screen.region_foursplit", text="Toggle Quad View")
 #              col = layout.column()
-#              col.itemR(view, "lock_rotation")
-#              col.itemR(view, "box_preview")
-#              col.itemR(view, "box_clip")
+#              col.prop(view, "lock_rotation")
+#              col.prop(view, "box_preview")
+#              col.prop(view, "box_clip")
+
 
 class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1289,8 +1615,8 @@ class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
     bl_label = "Mesh Display"
 
     def poll(self, context):
-        editmesh = context.mode == 'EDIT_MESH'
-        return (editmesh)
+        # The active object check is needed because of localmode
+        return (context.active_object and (context.mode == 'EDIT_MESH'))
 
     def draw(self, context):
         layout = self.layout
@@ -1298,25 +1624,26 @@ class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
         mesh = context.active_object.data
 
         col = layout.column()
-        col.itemL(text="Overlays:")
-        col.itemR(mesh, "draw_edges", text="Edges")
-        col.itemR(mesh, "draw_faces", text="Faces")
-        col.itemR(mesh, "draw_creases", text="Creases")
-        col.itemR(mesh, "draw_bevel_weights", text="Bevel Weights")
-        col.itemR(mesh, "draw_seams", text="Seams")
-        col.itemR(mesh, "draw_sharp", text="Sharp")
-
-        col.itemS()
-        col.itemL(text="Normals:")
-        col.itemR(mesh, "draw_normals", text="Face")
-        col.itemR(mesh, "draw_vertex_normals", text="Vertex")
-        col.itemR(context.scene.tool_settings, "normal_size", text="Normal Size")
-
-        col.itemS()
-        col.itemL(text="Numerics:")
-        col.itemR(mesh, "draw_edge_lenght")
-        col.itemR(mesh, "draw_edge_angle")
-        col.itemR(mesh, "draw_face_area")
+        col.label(text="Overlays:")
+        col.prop(mesh, "draw_edges", text="Edges")
+        col.prop(mesh, "draw_faces", text="Faces")
+        col.prop(mesh, "draw_creases", text="Creases")
+        col.prop(mesh, "draw_bevel_weights", text="Bevel Weights")
+        col.prop(mesh, "draw_seams", text="Seams")
+        col.prop(mesh, "draw_sharp", text="Sharp")
+
+        col.separator()
+        col.label(text="Normals:")
+        col.prop(mesh, "draw_normals", text="Face")
+        col.prop(mesh, "draw_vertex_normals", text="Vertex")
+        col.prop(context.scene.tool_settings, "normal_size", text="Normal Size")
+
+        col.separator()
+        col.label(text="Numerics:")
+        col.prop(mesh, "draw_edge_lenght")
+        col.prop(mesh, "draw_edge_angle")
+        col.prop(mesh, "draw_face_area")
+
 
 class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1333,10 +1660,11 @@ class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel):
         curve = context.active_object.data
 
         col = layout.column()
-        col.itemL(text="Overlays:")
-        col.itemR(curve, "draw_handles", text="Handles")
-        col.itemR(curve, "draw_normals", text="Normals")
-        col.itemR(context.scene.tool_settings, "normal_size", text="Normal Size")
+        col.label(text="Overlays:")
+        col.prop(curve, "draw_handles", text="Handles")
+        col.prop(curve, "draw_normals", text="Normals")
+        col.prop(context.scene.tool_settings, "normal_size", text="Normal Size")
+
 
 class VIEW3D_PT_background_image(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1346,14 +1674,14 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
 
     def poll(self, context):
         view = context.space_data
-        bg = context.space_data.background_image
+        bg = context.space_data.background_image
         return (view)
 
     def draw_header(self, context):
         layout = self.layout
         view = context.space_data
 
-        layout.itemR(view, "display_background_image", text="")
+        layout.prop(view, "display_background_image", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -1365,16 +1693,16 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
             layout.active = view.display_background_image
 
             col = layout.column()
-            col.itemR(bg, "image", text="")
-            #col.itemR(bg, "image_user")
-            col.itemR(bg, "size")
-            col.itemR(bg, "transparency", slider=True)
+            col.template_ID(bg, "image", open="image.open")
+            col.prop(bg, "size")
+            col.prop(bg, "transparency", slider=True)
 
 
             col = layout.column(align=True)
-            col.itemL(text="Offset:")
-            col.itemR(bg, "offset_x", text="X")
-            col.itemR(bg, "offset_y", text="Y")
+            col.label(text="Offset:")
+            col.prop(bg, "offset_x", text="X")
+            col.prop(bg, "offset_y", text="Y")
+
 
 class VIEW3D_PT_transform_orientations(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1393,14 +1721,15 @@ class VIEW3D_PT_transform_orientations(bpy.types.Panel):
 
         col = layout.column()
 
-        col.itemR(view, "transform_orientation")
-        col.itemO("tfm.create_orientation", text="Create")
+        col.prop(view, "transform_orientation")
+        col.operator("tfm.create_orientation", text="Create")
 
         orientation = view.current_orientation
 
         if orientation:
-            col.itemR(orientation, "name")
-            col.itemO("tfm.delete_orientation", text="Delete")
+            col.prop(orientation, "name")
+            col.operator("tfm.delete_orientation", text="Delete")
+
 
 class VIEW3D_PT_etch_a_ton(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -1417,7 +1746,7 @@ class VIEW3D_PT_etch_a_ton(bpy.types.Panel):
         layout = self.layout
         toolsettings = context.scene.tool_settings
 
-        layout.itemR(toolsettings, "bone_sketching", text="")
+        layout.prop(toolsettings, "bone_sketching", text="")
 
     def draw(self, context):
         layout = self.layout
@@ -1425,23 +1754,60 @@ class VIEW3D_PT_etch_a_ton(bpy.types.Panel):
 
         col = layout.column()
 
-        col.itemR(toolsettings, "etch_quick")
-        col.itemR(toolsettings, "etch_overdraw")
+        col.prop(toolsettings, "etch_quick")
+        col.prop(toolsettings, "etch_overdraw")
+
+        col.prop(toolsettings, "etch_convert_mode")
+
+        if toolsettings.etch_convert_mode == 'LENGTH':
+            col.prop(toolsettings, "etch_length_limit")
+        elif toolsettings.etch_convert_mode == 'ADAPTIVE':
+            col.prop(toolsettings, "etch_adaptive_limit")
+        elif toolsettings.etch_convert_mode == 'FIXED':
+            col.prop(toolsettings, "etch_subdivision_number")
+        elif toolsettings.etch_convert_mode == 'RETARGET':
+            col.prop(toolsettings, "etch_template")
+            col.prop(toolsettings, "etch_roll_mode")
+            col.prop(toolsettings, "etch_autoname")
+            col.prop(toolsettings, "etch_number")
+            col.prop(toolsettings, "etch_side")
+
+
+class VIEW3D_PT_context_properties(bpy.types.Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_label = "Properties"
+    bl_default_closed = True
+
+    def _active_context_member(self, context):
+        obj = context.object
+        if obj:
+            mode = obj.mode
+            if mode == 'POSE':
+                return "active_pose_bone"
+            elif mode == 'EDIT' and obj.type == 'ARMATURE':
+                return "active_bone"
+            else:
+                return "object"
+
+        return ""
+    
+    def poll(self, context):
+        member = self._active_context_member(context)
+        if member:
+            context_member = getattr(context, member)
+            return context_member and context_member.keys()
+
+        return False
 
-        col.itemR(toolsettings, "etch_convert_mode")
+    def draw(self, context):
+        import rna_prop_ui
+        # reload(rna_prop_ui)
+        member = self._active_context_member(context)
 
-        if toolsettings.etch_convert_mode == "LENGTH":
-            col.itemR(toolsettings, "etch_length_limit")
-        elif toolsettings.etch_convert_mode == "ADAPTIVE":
-            col.itemR(toolsettings, "etch_adaptive_limit")
-        elif toolsettings.etch_convert_mode == "FIXED":
-            col.itemR(toolsettings, "etch_subdivision_number")
-        elif toolsettings.etch_convert_mode == "RETARGET":
-            col.itemR(toolsettings, "etch_template")
-            col.itemR(toolsettings, "etch_roll_mode")
-            col.itemR(toolsettings, "etch_autoname")
-            col.itemR(toolsettings, "etch_number")
-            col.itemR(toolsettings, "etch_side")
+        if member:
+            # Draw with no edit button
+            rna_prop_ui.draw(self.layout, context, member, False)
 
 
 # Operators
@@ -1455,21 +1821,23 @@ class OBJECT_OT_select_pattern(bpy.types.Operator):
     bl_register = True
     bl_undo = True
 
-    pattern = StringProperty(name="Pattern", description="Name filter using '*' and '?' wildcard chars", maxlen= 32, default= "*")
-    case_sensitive = BoolProperty(name="Case Sensitive", description="Do a case sensitive compare", default= False)
-    extend = BoolProperty(name="Extend", description="Extend the existing selection", default= True)
-
+    pattern = StringProperty(name="Pattern", description="Name filter using '*' and '?' wildcard chars", maxlen=32, default="*")
+    case_sensitive = BoolProperty(name="Case Sensitive", description="Do a case sensitive compare", default=False)
+    extend = BoolProperty(name="Extend", description="Extend the existing selection", default=True)
 
     def execute(self, context):
 
         import fnmatch
-        if self.case_sensitive:        pattern_match = fnmatch.fnmatchcase
-        else:                                  pattern_match = lambda a, b: fnmatch.fnmatchcase(a.upper(), b.upper())
+
+        if self.properties.case_sensitive:
+            pattern_match = fnmatch.fnmatchcase
+        else:
+            pattern_match = lambda a, b: fnmatch.fnmatchcase(a.upper(), b.upper())
 
         for ob in context.visible_objects:
-            if pattern_match(ob.name, self.pattern):
+            if pattern_match(ob.name, self.properties.pattern):
                 ob.selected = True
-            elif not self.extend:
+            elif not self.properties.extend:
                 ob.selected = False
 
         return ('FINISHED',)
@@ -1478,7 +1846,7 @@ class OBJECT_OT_select_pattern(bpy.types.Operator):
     '''
     def invoke(self, context, event):
         wm = context.manager
-        wm.add_fileselect(self.__operator__)
+        wm.add_fileselect(self)
         return ('RUNNING_MODAL',)
     '''
 
@@ -1487,6 +1855,7 @@ bpy.types.register(VIEW3D_HT_header) # Header
 bpy.types.register(VIEW3D_MT_view) #View Menus
 bpy.types.register(VIEW3D_MT_view_navigation)
 bpy.types.register(VIEW3D_MT_view_align)
+bpy.types.register(VIEW3D_MT_view_align_selected)
 bpy.types.register(VIEW3D_MT_view_cameras)
 
 bpy.types.register(VIEW3D_MT_select_object) # Select Menus
@@ -1500,6 +1869,11 @@ bpy.types.register(VIEW3D_MT_select_edit_lattice)
 bpy.types.register(VIEW3D_MT_select_edit_armature)
 bpy.types.register(VIEW3D_MT_select_face) # XXX todo
 
+bpy.types.register(VIEW3D_MT_transform) # Object/Edit Menus
+bpy.types.register(VIEW3D_MT_mirror) # Object/Edit Menus
+bpy.types.register(VIEW3D_MT_snap) # Object/Edit Menus
+bpy.types.register(VIEW3D_MT_uv_map) # Edit Menus
+
 bpy.types.register(VIEW3D_MT_object) # Object Menu
 bpy.types.register(VIEW3D_MT_object_apply)
 bpy.types.register(VIEW3D_MT_object_clear)
@@ -1509,7 +1883,10 @@ bpy.types.register(VIEW3D_MT_object_group)
 bpy.types.register(VIEW3D_MT_object_constraints)
 bpy.types.register(VIEW3D_MT_object_showhide)
 bpy.types.register(VIEW3D_MT_make_single_user)
+bpy.types.register(VIEW3D_MT_make_links)
 
+bpy.types.register(VIEW3D_MT_hook)
+bpy.types.register(VIEW3D_MT_vertex_group)
 
 bpy.types.register(VIEW3D_MT_sculpt) # Sculpt Menu
 
@@ -1527,8 +1904,6 @@ bpy.types.register(VIEW3D_MT_pose_ik)
 bpy.types.register(VIEW3D_MT_pose_constraints)
 bpy.types.register(VIEW3D_MT_pose_showhide)
 
-bpy.types.register(VIEW3D_MT_snap) # Edit Menus
-
 bpy.types.register(VIEW3D_MT_edit_mesh)
 bpy.types.register(VIEW3D_MT_edit_mesh_specials) # Only as a menu for keybindings
 bpy.types.register(VIEW3D_MT_edit_mesh_vertices)
@@ -1556,13 +1931,18 @@ bpy.types.register(VIEW3D_MT_edit_armature)
 bpy.types.register(VIEW3D_MT_edit_armature_parent)
 bpy.types.register(VIEW3D_MT_edit_armature_roll)
 
-bpy.types.register(VIEW3D_PT_3dview_properties) # Panels
+bpy.types.register(VIEW3D_MT_armature_specials) # Only as a menu for keybindings
+
+ # Panels
+bpy.types.register(VIEW3D_PT_3dview_properties)
 bpy.types.register(VIEW3D_PT_3dview_display)
+bpy.types.register(VIEW3D_PT_3dview_name)
 bpy.types.register(VIEW3D_PT_3dview_meshdisplay)
 bpy.types.register(VIEW3D_PT_3dview_curvedisplay)
 bpy.types.register(VIEW3D_PT_background_image)
 bpy.types.register(VIEW3D_PT_transform_orientations)
 bpy.types.register(VIEW3D_PT_etch_a_ton)
 
-bpy.ops.add(OBJECT_OT_select_pattern)
+bpy.types.register(VIEW3D_PT_context_properties)
 
+bpy.ops.add(OBJECT_OT_select_pattern)