Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -N -r1.19.2.16 -r1.19.2.17
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	9 Aug 2021 09:55:57 -0000	1.19.2.16
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	1 Apr 2022 13:47:51 -0000	1.19.2.17
@@ -131,7 +131,7 @@
     id
     {dropzone:boolean true}
     {current_folder:object}
-    {parent_id ""}
+    {parent_id:integer,0..1 ""}
   }
 
   ::xowiki::MenuBar instproc get_prop {dict key {default ""}} {
@@ -311,11 +311,9 @@
                {object_type ::xowiki::File} \
                parent_id return_url autoname template_file]
 
-      set new_form_link \
-          [::$package_id make_link \
-               ::$package_id edit-new \
-               {object_type ::xowiki::Form} \
-               parent_id return_url autoname template_file]
+      set new_form_link [::$package_id make_form_link -form en:form.form \
+                             -parent_id ${:parent_id} \
+                             -nls_language $nls_language -return_url $return_url]
     }
 
     :add_menu_item -name New.Page   -item [list url $new_page_link]
@@ -608,8 +606,9 @@
                 -package_key xowiki \
                 -parameter PreferredCSSToolkit \
                 -default bootstrap] {
-      bootstrap {set menuBarRenderer render-bootstrap}
-      default   {set menuBarRenderer render-yui}
+      bootstrap -
+      bootstrap5 {set menuBarRenderer render-bootstrap}
+      default    {set menuBarRenderer render-yui}
     }
     :$menuBarRenderer
   }