Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.332.2.10 -r1.332.2.11
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	12 May 2019 16:10:16 -0000	1.332.2.10
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	12 May 2019 19:55:44 -0000	1.332.2.11
@@ -1013,7 +1013,7 @@
     }
     set top_includelets ""; set content $error_msg; set folderhtml ""
     ::xo::cc set status_code $status_code
-    ::xo::Page requireCSS urn:ad:css:xowiki
+    ::xo::Page requireCSS urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
     ${:id} return_page -adp $template_file -variables {
       context title index_link back_link header_stuff error_msg
       top_includelets content folderhtml
@@ -1959,8 +1959,8 @@
   }
 
   Package proc require_site_wide_pages {
-                                        {-refetch:boolean false}
-                                      } {
+    {-refetch:boolean false}
+  } {
     set parent_id -100
     set package_id [::xowiki::Package first_instance]
     ::xowiki::Package require $package_id
@@ -1981,6 +1981,12 @@
     }
   }
 
+  Package proc preferredCSSToolkit {} {
+    return [parameter::get_global_value -package_key xowiki \
+                -parameter PreferredCSSToolkit \
+                -default bootstrap]
+  }
+  
   Package proc lookup_side_wide_page {-name:required} {
     return [::xo::db::CrClass lookup -name $name -parent_id -100]
   }