Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.55.2.58 -r1.55.2.59
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	15 Dec 2022 19:30:02 -0000	1.55.2.58
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	2 Feb 2024 12:35:12 -0000	1.55.2.59
@@ -42,7 +42,7 @@
       }
 
   folders instproc include_head_entries {} {
-    switch [::${:package_id} get_parameter PreferredCSSToolkit:graph bootstrap] {
+    switch [::xowiki::CSS toolkit] {
       yui     {::xowiki::Tree include_head_entries -renderer yuitree -style folders}
       bootstrap -
       default { ::xowiki::Tree include_head_entries -renderer bootstrap3 }
@@ -53,7 +53,7 @@
     :get_parameters
 
     set tree [:build_tree]
-    switch [::${:package_id} get_parameter PreferredCSSToolkit:graph bootstrap] {
+    switch [::xowiki::CSS toolkit] {
       yui {
            set js "
            var [:js_name];
@@ -279,10 +279,15 @@
       set menu_entries [list \
                             {*}[::$package_id get_parameter ExtraMenuEntries {}] \
                             {*}[${:current_folder} property extra_menu_entries]]
-      set have_config [lsearch -index 0 $menu_entries config]
+      set have_config [lsearch -all -index 0 $menu_entries config]
 
-      if {$have_config > -1} {
+      if {$have_config != -1} {
         #
+        # In case, we have multiple entries, use the last one.
+        #
+        set have_config [lrange $have_config end end]
+
+        #
         # We have a special configuration for the menubar, probably
         # consisting of a default setup and/or a menubar class. The
         # entry should be of the form:
@@ -347,6 +352,7 @@
       $mb current_folder ${:current_folder}
       $mb parent_id $opt_parent_id
       #:log "folders: call update_items with config '$config' bind_vars=$bind_vars"
+
       $mb update_items \
           -bind_vars $bind_vars \
           -config $config \
@@ -577,7 +583,7 @@
     set ::__xowiki_folder_link [::$package_id make_link \
                                     -link $current_folder_pretty_link \
                                     $current_folder bulk-delete $csrf return_url]
-    switch [::$package_id get_parameter PreferredCSSToolkit:graph bootstrap] {
+    switch [::xowiki::CSS toolkit] {
       bootstrap5 -
       bootstrap {set tableWidgetClass ::xowiki::BootstrapTable}
       default   {set tableWidgetClass ::xowiki::YUIDataTable}
Index: openacs-4/packages/xowiki/tcl/table-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/table-widget-procs.tcl,v
diff -u -r1.1.2.20 -r1.1.2.21
--- openacs-4/packages/xowiki/tcl/table-widget-procs.tcl	24 Apr 2022 17:00:43 -0000	1.1.2.20
+++ openacs-4/packages/xowiki/tcl/table-widget-procs.tcl	2 Feb 2024 12:35:12 -0000	1.1.2.21
@@ -104,14 +104,11 @@
     if {$renderer ne ""} {
       lappend cmd -renderer $renderer
     } else {
-      switch [parameter::get_global_value \
-                  -package_key xowiki \
-                  -parameter PreferredCSSToolkit \
-                  -default bootstrap] {
-                    bootstrap -
-                    bootstrap5 {set renderer BootstrapTableRenderer}
-                    default    {set renderer YUIDataTableRenderer}
-                  }
+      switch [::xowiki::CSS toolkit] {
+        bootstrap -
+        bootstrap5 {set renderer BootstrapTableRenderer}
+        default    {set renderer YUIDataTableRenderer}
+      }
       lappend cmd -renderer $renderer
     }
     set table_widget [{*}$cmd]