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.3 -r1.248.2.4
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	18 Aug 2015 12:42:28 -0000	1.248.2.3
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Sep 2015 18:38:45 -0000	1.248.2.4
@@ -396,6 +396,10 @@
     if {[my exists editor]} {append spec " {options {editor [my set editor]}} "}
     append spec " {label " [list $label] "} "
 
+    if {[string match *bootstrap* [subsite::get_theme]]} {
+      my array set html class "form-control"
+    }
+    
     if {[my exists html]} {
       append spec " {html {"
       foreach {key value} [array get html] {
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.6 -r1.327.2.7
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Aug 2015 16:22:18 -0000	1.327.2.6
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Sep 2015 18:38:45 -0000	1.327.2.7
@@ -648,7 +648,7 @@
 
     array set property_doc [::xo::Page get_property doc]
     set tmpl [acs_root_dir]/packages/[[my package_id] package_key]/www/edit
-    set edit_tmpl [expr {[file readable $tmpl] ? $tmpl : "/packages/xowiki/www/edit" }]
+    set edit_tmpl [::template::themed_template [expr {[file readable $tmpl] ? $tmpl : "/packages/xowiki/www/edit" }]]
     set html [$package_id return_page -adp $edit_tmpl \
                   -form f1 \
                   -variables {item_id parent_id edit_form_page_title context formTemplate
Index: openacs-4/packages/xowiki/www/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/xowiki/www/edit.adp	3 Jul 2015 10:30:42 -0000	1.8
+++ openacs-4/packages/xowiki/www/edit.adp	7 Sep 2015 18:38:45 -0000	1.8.2.1
@@ -21,4 +21,4 @@
    <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
 </div>
   
-<formtemplate id="@formTemplate@"></formtemplate>
+<formtemplate id="@formTemplate;literal@"></formtemplate>