Index: openacs-4/packages/xowiki/lib/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/lib/view.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/xowiki/lib/view.tcl	16 May 2018 15:23:55 -0000	1.14
+++ openacs-4/packages/xowiki/lib/view.tcl	14 May 2019 15:25:45 -0000	1.14.2.1
@@ -19,10 +19,9 @@
 }
 
 set html [::$package_id invoke -method $m]
-#set ::xowiki_head [::xo::Page header_stuff]
 
 if {![info exists css]} {
-    set fn [acs_root_dir]/packages/xowiki/www/resources/xowiki.css
+    set fn [acs_root_dir]/packages/xowiki/www/resources/xowiki-[::xowiki::Package preferredCSSToolkit].css
     set F [open $fn]; set css [read $F]; close $F
     set css "<style type='text/css'>$css</style>"
     set html $css$html
Index: openacs-4/packages/xowiki/resources/templates/error-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/error-template.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/xowiki/resources/templates/error-template.adp	7 Aug 2017 23:48:30 -0000	1.2
+++ openacs-4/packages/xowiki/resources/templates/error-template.adp	14 May 2019 15:25:45 -0000	1.2.2.1
@@ -1,9 +1,8 @@
 <master>
   <property name="doc(title)">@title;literal@</property>
-  <property name="doc(title)">@title;literal@</property>
   <property name="context">@context;literal@</property>
   <property name="head">@header_stuff;literal@
-  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" />
+  <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki-<%= ::xowiki::Package preferredCSSToolkit %>.css" media="all" />
   </property>
 
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.adp,v
diff -u -r1.13 -r1.13.4.1
--- openacs-4/packages/xowiki/www/admin/index.adp	7 Jul 2015 12:11:48 -0000	1.13
+++ openacs-4/packages/xowiki/www/admin/index.adp	14 May 2019 15:25:45 -0000	1.13.4.1
@@ -1,9 +1,7 @@
 <master>
   <property name="doc(title)">@title;literal@</property>
-  <property name="doc(title)">@title;literal@</property>
   <property name="context">@context;literal@</property>
   <property name="head">
-<link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
 <style  type="text/css">
 .rss {border:1px solid;
 	border-color:#FC9 #630 #330 #F96;
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 -r1.31.2.1 -r1.31.2.2
--- openacs-4/packages/xowiki/www/admin/index.tcl	8 May 2019 14:33:40 -0000	1.31.2.1
+++ openacs-4/packages/xowiki/www/admin/index.tcl	14 May 2019 15:25:45 -0000	1.31.2.2
@@ -14,6 +14,9 @@
 set pretty_plural [$object_type set pretty_plural]
 set title [_ xowiki.admin_all_title]
 
+template::head::add_css \
+    -href urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
+
 set object_types [$object_type object_types]
 set return_url   [ns_conn url]
 set category_url [export_vars -base [::$package_id package_url] { {manage-categories 1} {object_id $package_id}}]
Index: openacs-4/packages/xowiki/www/admin/list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.adp,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/xowiki/www/admin/list.adp	7 Jul 2015 12:11:48 -0000	1.9
+++ openacs-4/packages/xowiki/www/admin/list.adp	14 May 2019 15:25:45 -0000	1.9.4.1
@@ -1,9 +1,7 @@
 <master>
   <property name="doc(title)">@title;literal@</property>
-  <property name="doc(title)">@title;literal@</property>
   <property name="context">@context;literal@</property>
   <property name="head">
-<link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
 <style  type="text/css">
 .rss {border:1px solid;
 	border-color:#FC9 #630 #330 #F96;
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 -r1.38.2.1 -r1.38.2.2
--- openacs-4/packages/xowiki/www/admin/list.tcl	8 May 2019 14:33:40 -0000	1.38.2.1
+++ openacs-4/packages/xowiki/www/admin/list.tcl	14 May 2019 15:25:45 -0000	1.38.2.2
@@ -34,11 +34,15 @@
   set with_children true
 }
 
+template::head::add_css \
+    -href urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
+
 set return_url [expr {$per_type ? [export_vars -base [::$package_id url] object_type] :
                       [::$package_id url]}]
 
 set category_url [export_vars -base [::$package_id package_url] { {manage-categories 1} {object_id $package_id}}]
 
+
 set actions [subst {
   Action new -label "[lang::message::lookup {} categories.Categories Categories]" \
       -url $category_url