menus: update

 MainMenuCommon.xml | 101 +++++++++++++++++++++--------------------------------
 PARMmenu.xmlx      |  26 +++++---------
 2 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/MainMenuCommon.xml b/MainMenuCommon.xml
index 610dd32..2a48d94 100755
--- a/MainMenuCommon.xml
+++ b/MainMenuCommon.xml
@@ -10,98 +10,75 @@
     <removeItem id="takes_menu_mm" />
 
     <subMenu id="hc_submenu">
-    <label>hc</label>
+      <label>hc</label>
 
       <titleItem>
         <label>Global</label>
       </titleItem>
 
-      <scriptItem id="h.hcglobal_open_color_editor">
+      <scriptItem id="h.hc_session_coloreditor">
         <label>Color Editor</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().openColorEditor()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().colorEditor()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_keycam">
+      <scriptItem id="h.hc_session_keycam">
         <label>Keycam</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().keycam()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().keycam()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_reload_color_schemes">
-        <label>Reload Color Schemes</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().reload_color_schemes()]]>
-        </scriptCode>
+      <scriptItem id="h.hc_session_reloadcolors">
+        <label>Reload Colors</label>
+        <scriptCode><![CDATA[from hc import Session; Session().reloadColorSchemes()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_reload_hotkeys">
+      <scriptItem id="h.hc_session_reloadhotkeys">
         <label>Reload Hotkeys</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().reloadHotkeys()]]>
-        </scriptCode>
-    </scriptItem>
+        <scriptCode><![CDATA[from hc import Session; Session().reloadHotkeys()]]></scriptCode>
+      </scriptItem>
+
+      <!-- <scriptItem id="h.hc_session_reloadpackage"> -->
+        <!-- <label>Reload Package</label> -->
+        <!-- <scriptCode><![CDATA[from hc import Session; Session().reloadStudioUtils()]]></scriptCode> -->
+      <!-- </scriptItem> -->
 
-      <scriptItem id="h.hcglobal_reload_keycam">
+      <scriptItem id="h.hc_session_reloadkeycam">
         <label>Reload Keycam</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().reloadKeycam()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().reloadKeycam()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_restart_houdini">
-        <label>Restart Houdini</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().restartHoudini()]]>
-        </scriptCode>
-    </scriptItem>
+      <!-- <scriptItem id="h.hc_session_restarthoudini"> -->
+        <!-- <label>Restart Houdini</label> -->
+        <!-- <scriptCode><![CDATA[from hc import Session; Session().restartHoudini()]]></scriptCode> -->
+      <!-- </scriptItem> -->
 
-      <scriptItem id="h.hcglobal_toggle_menus">
+      <scriptItem id="h.hc_session_togglemenus">
         <label>Toggle Menus</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().toggleMenus()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().toggleMenus()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_toggle_network_controls">
+      <scriptItem id="h.hc_session_togglenetworkcontrols">
         <label>Toggle Network Controls</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().toggleNetworkControls()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().toggleNetworkControls()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_toggle_tabs">
+      <scriptItem id="h.hc_session_toggletabs">
         <label>Toggle Tabs</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().toggleTabs()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().toggleTabs()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_toggle_stowbars">
+      <scriptItem id="h.hc_session_togglestowbars">
         <label>Toggle Stowbars</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().toggleStowbars()]]>
-        </scriptCode>
+        <scriptCode><![CDATA[from hc import Session; Session().toggleStowbars()]]></scriptCode>
       </scriptItem>
 
-      <scriptItem id="h.hcglobal_update_main_menu_bar">
-        <label>Update Main Menu Bar</label>
-        <scriptCode>
-<![CDATA[from hclib import HCGlobal
-HCGlobal().updateMainMenuBar()]]>
-        </scriptCode>
+      <!-- <scriptItem id="h.hc_session_updatemainmenubar"> -->
+        <!-- <label>Update Main Menu Bar</label> -->
+        <!-- <scriptCode><![CDATA[from hc import Session; Session().updateMainMenuBar()]]></scriptCode> -->
+      <!-- </scriptItem> -->
+
+      <scriptItem id="h.hc_panel">
+        <label>HC Panel</label>
+        <scriptCode><![CDATA[from hc import Panel; Panel().show()]]></scriptCode>
       </scriptItem>
 
       <separatorItem />
@@ -117,8 +94,8 @@ HCGlobal().updateMainMenuBar()]]>
       </titleItem>
 
       <separatorItem />
-      <separatorItem />
 
     </subMenu>
+
   </menuBar>
 </mainMenu>
diff --git a/PARMmenu.xmlx b/PARMmenu.xmlx
index 7d7fe25..a2e8ac1 100644
--- a/PARMmenu.xmlx
+++ b/PARMmenu.xmlx
@@ -1,6 +1,8 @@
+
 <?xml version="1.0" encoding="UTF-8"?>
 <menuDocument>
   <menu>
+
     <removeItem id="take_activate"/>
     <removeItem id="lock_parm"/>
     <removeItem id="unlock_parm"/>
@@ -8,34 +10,22 @@
     <removeItem id="set_curr_as_def"/>
     <removeItem id="export_parm_type_props"/>
 
-
     <scriptItem id="vector_set_x">
       <label>Set to X</label>
       <context>
-        <expression><![CDATA[
-from hclib import hcmenuutils as hcmu
-return hcmu.vector3Test(kwargs)
-]]></expression>
+        <expression><![CDATA[from hc import menuutils; return menuutils.vector3Test(kwargs)]]></expression>
       </context>
-      <scriptCode><![CDATA[
-from hclib import hcmenuutils as hcmu
-hcmu.setVector3(kwargs, 1, 0, 0)
-]]></scriptCode>
+      <scriptCode><![CDATA[from hc import menuutils; menuutils.setVector3(kwargs, 1, 0, 0)]]></scriptCode>
     </scriptItem>
 
 
     <scriptItem id="vector_lock">
       <label>Lock Y and Z to X</label>
       <context>
-        <expression><![CDATA[
-from hclib import hcmenuutils as hcmu
-return hmu.vector3Test(kwargs)
-]]></expression>
+        <expression><![CDATA[from hc import menuutils; return menuutils.vector3Test(kwargs)]]></expression>
       </context>
-      <scriptCode><![CDATA[
-from hclib import hcmenuutils as hcmu
-hcmu.vector3XMaster(kwargs)
-]]></scriptCode>
+      <scriptCode><![CDATA[from hc import menuutils; menuutils.vector3XMaster(kwargs)]]></scriptCode>
     </scriptItem>
-  </menu>
+
+    </menu>
 </menuDocument>