Index: openacs-4/packages/xowiki/resources/templates/error-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/Attic/error-template.tcl,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/error-template.tcl	9 Feb 2020 16:12:41 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/error-template.tcl	23 Sep 2021 16:09:11 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 template::head::add_css \
-    -href urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
+    -href urn:ad:css:xowiki-[::xowiki::CSS toolkit]
 
 
 # Local variables:
Index: openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/Attic/xowiki-admin-tests-procs.tcl,v
diff -u -N -r1.1.2.17 -r1.1.2.18
--- openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	31 Mar 2021 13:13:22 -0000	1.1.2.17
+++ openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	23 Sep 2021 16:09:11 -0000	1.1.2.18
@@ -93,6 +93,7 @@
       "::xo::db::sql::content_folder proc new"
       "::xo::tdom::AttributeManager instproc get_local_attributes"
       "::xotcl::Object instproc unset"
+      "::xowiki::CSS toolkit"
       "::xowiki::File instproc www-download"
       "::xowiki::FormPage instproc is_folder_page"
       "::xowiki::FormPage instproc property"
@@ -101,7 +102,6 @@
       "::xowiki::Package instproc make_link"
       "::xowiki::Package instproc resolve_page"
       "::xowiki::Package instproc www-delete"
-      "::xowiki::Package proc preferredCSSToolkit"
       "::xowiki::Page instproc is_folder_page"
       "::xowiki::Page instproc pretty_link"
       "::xowiki::Page instproc render"
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -N -r1.31.2.4 -r1.31.2.5
--- openacs-4/packages/xowiki/www/admin/index.tcl	26 Aug 2020 18:46:08 -0000	1.31.2.4
+++ openacs-4/packages/xowiki/www/admin/index.tcl	23 Sep 2021 16:09:12 -0000	1.31.2.5
@@ -14,7 +14,7 @@
 set pretty_plural [$object_type set pretty_plural]
 set title [_ xowiki.admin_all_title]
 
-set CSSToolkit [::xowiki::Package preferredCSSToolkit]
+set CSSToolkit [::xowiki::CSS toolkit]
 if {$CSSToolkit eq "bootstrap"} {
   template::head::add_css -href urn:ad:css:bootstrap3
 }
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.38.2.7 -r1.38.2.8
--- openacs-4/packages/xowiki/www/admin/list.tcl	29 Jul 2021 17:27:02 -0000	1.38.2.7
+++ openacs-4/packages/xowiki/www/admin/list.tcl	23 Sep 2021 16:09:12 -0000	1.38.2.8
@@ -34,7 +34,7 @@
   set with_children true
 }
 
-set CSSToolkit [::xowiki::Package preferredCSSToolkit]
+set CSSToolkit [::xowiki::CSS toolkit]
 if {$CSSToolkit eq "bootstrap"} {
   template::head::add_css -href urn:ad:css:bootstrap3
 }