Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.153.2.29 -r1.153.2.30
--- openacs-4/packages/xowiki/xowiki.info	15 Feb 2017 11:28:50 -0000	1.153.2.29
+++ openacs-4/packages/xowiki/xowiki.info	22 Feb 2017 10:03:30 -0000	1.153.2.30
@@ -61,7 +61,7 @@
 	<requires url="acs-tcl" version="5.9.1b1"/>
 	<requires url="acs-templating" version="5.9.1b1"/>
         <requires url="acs-subsite" version="5.9.1b1"/>
-	<requires url="richtext-xinha" version="0.2"/>
+	<requires url="richtext-ckeditor4" version="0.10"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.9.1b1"/>
         <requires url="general-comments" version="5.9.1b1"/>
@@ -82,8 +82,8 @@
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="PackageDescription"  description="Description of the Package. This description will appear for example in the Description of the default RSS feed for this package" section_name="Description"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackagePath"  description="Space delimited names of local URL paths pointing to xowiki instances from where this instance should inherit pages (example: /xowiki /public/wiki)"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackageTitle"  description="Title of the Package; this title will appear for example in the default RSS feed for this package." section_name="Description"/>
-            <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredCSSToolkit"  default="yui" description="Use either &quot;yui&quot; or &quot;bootstrap&quot;"/>
-            <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredRichtextEditor"  default="xinha" description="Preferred richtext editor, such as: xinha (default), ckeditor, ckeditor4 or wym"/>
+            <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredCSSToolkit"  default="bootstrap" description="Use either &quot;yui&quot; or &quot;bootstrap&quot;"/>
+            <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredRichtextEditor"  default="ckeditor4" description="Preferred richtext editor, such as: xinha (default), ckeditor, ckeditor4 or wym"/>
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="WidgetSpecs"  description="Specify pairs of &quot;pagename,fieldname&quot; followed by a Tcl list which is used as a widget spec for ad_form. &quot;pagename&quot; and &quot;fieldname&quot; can contain wild card characters. The following rather complex widget-specs are from OpenACS.org:
 
 *,text {richtext(richtext),nospell,optional 
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.33.2.8 -r1.33.2.9
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	1 Oct 2016 11:04:31 -0000	1.33.2.8
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	22 Feb 2017 10:03:30 -0000	1.33.2.9
@@ -548,7 +548,7 @@
     set ::__xowiki_with_publish_status [expr {$publish_status ne "ready"}]
     set ::__xowiki_folder_link [$package_id make_link $current_folder bulk-delete {__csrf_token [::security::csrf::token]}]
     
-    switch [$package_id get_parameter PreferredCSSToolkit yui] {
+    switch [$package_id get_parameter PreferredCSSToolkit bootstrap] {
       bootstrap {set tableWidgetClass ::xowiki::BootstrapTable}
       default   {set tableWidgetClass ::xowiki::YUIDataTable}
     }
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.248.2.42 -r1.248.2.43
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Feb 2017 19:04:00 -0000	1.248.2.42
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	22 Feb 2017 10:03:30 -0000	1.248.2.43
@@ -1735,7 +1735,7 @@
     #ns_log notice "==== [my name] EDITOR specified? [my exists editor]"
     if {![my exists editor]} {
       my set editor [parameter::get_global_value -package_key xowiki \
-                         -parameter PreferredRichtextEditor -default xinha]
+                         -parameter PreferredRichtextEditor -default ckeditor4]
       #my msg "setting default of [my name] to [my set editor]"
     }
     if {![my exists __initialized]} {
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.200.2.28 -r1.200.2.29
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	11 Feb 2017 12:27:58 -0000	1.200.2.28
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	22 Feb 2017 10:03:30 -0000	1.200.2.29
@@ -3940,7 +3940,7 @@
     if {$renderer ne ""} {
       lappend cmd -renderer $renderer
     } else {
-      switch [parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default yui] {
+      switch [parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default bootstrap] {
         bootstrap {set renderer BootstrapTableRenderer}
         default   {set renderer YUIDataTableRenderer}
       }
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 -r1.8.2.5 -r1.8.2.6
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	13 Sep 2016 10:50:23 -0000	1.8.2.5
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	22 Feb 2017 10:03:30 -0000	1.8.2.6
@@ -379,7 +379,7 @@
   }
 
   ::xowiki::MenuBar instproc render-preferred {} {
-    switch [parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default yui] {
+    switch [parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default bootstrap] {
       bootstrap {set menuBarRenderer render-bootstrap}
       default   {set menuBarRenderer render-yui}
     }
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.485.2.54 -r1.485.2.55
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	21 Feb 2017 14:05:23 -0000	1.485.2.54
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Feb 2017 10:03:30 -0000	1.485.2.55
@@ -3313,7 +3313,7 @@
     # We need this acually only for PageTemplate and FormPage, but
     # aliases will require XOTcl 2.0.... so we define it for the time
     # being on ::xowiki::Page
-    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default yui] ne "bootstrap"} {
+    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default bootstrap] ne "bootstrap"} {
       set name [expr {$margin_form ? "margin-form " : ""}]
     } else {
       set name ""
@@ -3648,7 +3648,7 @@
     $doc documentElement root
     my dom_disable_input_fields -with_submit $with_submit $root
     set form [lindex [$root selectNodes //form] 0]
-    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default yui] ne "bootstrap"} {
+    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default bootstrap] ne "bootstrap"} {
       Form add_dom_attribute_value $form class "margin-form"
     }
     return [$root asHTML]
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.327.2.29 -r1.327.2.30
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	11 Feb 2017 12:27:58 -0000	1.327.2.29
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	22 Feb 2017 10:03:30 -0000	1.327.2.30
@@ -709,7 +709,7 @@
   FormPage instproc setCSSDefaults {} {
     #my log setCSSDefaults
     # check empty
-    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default yui] eq "bootstrap"} {
+    if {[parameter::get_global_value -package_key xowiki -parameter PreferredCSSToolkit -default bootstrap] eq "bootstrap"} {
       ::xowiki::formfield::FormField parameter {
         {CSSclass form-control}
         {form_item_wrapper_CSSclass form-group}