diff --git a/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
index 7b7eecce7..ffb367553 100644
--- a/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
+++ b/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
@@ -109,6 +109,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
         SimpleHash model = freemarkerManager.buildTemplateModel(stack, action, servletContext, req, res, config.getObjectWrapper());
 
         model.put("tag", templateContext.getTag());
+        model.put("themeProperties", getThemeProps(templateContext.getTemplate()));
 
         // the BodyContent JSP writer doesn't like it when FM flushes automatically --
         // so let's just not do it (it will be flushed eventually anyway)
diff --git a/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
index a54125948..afad4b587 100644
--- a/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
@@ -134,7 +134,7 @@ public class FreemarkerResult extends StrutsResultSupport {
             String base = ResourceUtil.getResourceBase(req);
             location = base + "/" + location;
         }
-
+        
         Template template = configuration.getTemplate(location, deduceLocale());
         TemplateModel model = createModel();
 
diff --git a/core/src/main/resources/template/ajax/controlheader.ftl b/core/src/main/resources/template/ajax/controlheader.ftl
index 9140c24de..1aab6cea2 100644
--- a/core/src/main/resources/template/ajax/controlheader.ftl
+++ b/core/src/main/resources/template/ajax/controlheader.ftl
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /-->
+<#--include "/${parameters.templateDir}/${themeProperties.parent}/controlheader-core.ftl" /-->
 <#if parameters.form?exists && parameters.form.validate?default(false) == true>
 	<#-- can't mutate the data model in freemarker -->
     <#if parameters.onblur?exists>
@@ -8,3 +9,5 @@
     </#if>
 </#if>
     <td>
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
+    
\ No newline at end of file
diff --git a/core/src/main/resources/template/ajax/form.ftl b/core/src/main/resources/template/ajax/form.ftl
index b22fc3c13..7ae5c0041 100644
--- a/core/src/main/resources/template/ajax/form.ftl
+++ b/core/src/main/resources/template/ajax/form.ftl
@@ -3,7 +3,7 @@
 <script src="${base}/dwr/interface/validator.js"></script>
 <script src="${base}/dwr/engine.js"></script>
 <script src="${base}/struts/ajax/validation.js"></script>
-<script src="${base}/struts/xhtml/validation.js"></script>
+<script src="${base}/struts/${themeProperties.parent}/validation.js"></script>
 </#if>
 <form<#rt/>
 <#if parameters.namespace?exists>
@@ -39,7 +39,10 @@
  ${tag.addParameter("ajaxSubmit", "true")}
  onSubmit="return isAjaxFormSubmit(this);"
 >
+<#include "/${parameters.templateDir}/${themeProperties.parent}/control.ftl" />
+<#--
 <table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
 <#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
 </#if>
 >
+-->
diff --git a/core/src/main/resources/template/ajax/head.ftl b/core/src/main/resources/template/ajax/head.ftl
index e6038bb1a..220b841f9 100644
--- a/core/src/main/resources/template/ajax/head.ftl
+++ b/core/src/main/resources/template/ajax/head.ftl
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/xhtml/head.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
 <script language="JavaScript" type="text/javascript"
         src="<@saf.url includeParams='none' value='/struts/ajax/dojoRequire.js' encode='false'/>"></script>
 <script language="JavaScript" type="text/javascript"
diff --git a/core/src/main/resources/template/ajax/submit-ajax.ftl b/core/src/main/resources/template/ajax/submit-ajax.ftl
index 03266fa08..f46e56654 100644
--- a/core/src/main/resources/template/ajax/submit-ajax.ftl
+++ b/core/src/main/resources/template/ajax/submit-ajax.ftl
@@ -1,5 +1,8 @@
+<#--
 <tr>
     <td colspan="2"><div <#rt/>
+-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
 <#if parameters.align?exists>
     align="${parameters.align?html}"<#t/>
 </#if>
@@ -37,4 +40,6 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
 ><#if parameters.nameValue?exists><@saf.property value="parameters.nameValue"/><#rt/></#if></button></div>
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlfooter.ftl" />
+
diff --git a/core/src/main/resources/template/ajax/submit.ftl b/core/src/main/resources/template/ajax/submit.ftl
index f155b503f..7962d4f8f 100644
--- a/core/src/main/resources/template/ajax/submit.ftl
+++ b/core/src/main/resources/template/ajax/submit.ftl
@@ -2,5 +2,6 @@
 <#include "/${parameters.templateDir}/ajax/submit-ajax.ftl" />
 ${tag.addFormParameter("ajaxSubmit", "false")}
 <#else>
-<#include "/${parameters.templateDir}/xhtml/submit.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/submit.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/submit.ftl" />
 </#if>
diff --git a/core/src/main/resources/template/ajax/textarea.ftl b/core/src/main/resources/template/ajax/textarea.ftl
index fa7690f7d..165e54c48 100644
--- a/core/src/main/resources/template/ajax/textarea.ftl
+++ b/core/src/main/resources/template/ajax/textarea.ftl
@@ -41,4 +41,5 @@
 </#if>
 </textarea>
 
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+<#--include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /-->
+<#include "/${parameters.templateDir}/${themeProperties.parent}/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/ajax/theme.properties b/core/src/main/resources/template/ajax/theme.properties
index 0a9fb9e76..1b04afac2 100644
--- a/core/src/main/resources/template/ajax/theme.properties
+++ b/core/src/main/resources/template/ajax/theme.properties
@@ -1 +1 @@
-parent = xhtml
+parent=xhtml
diff --git a/core/src/main/resources/template/css_xhtml/checkboxlist.ftl b/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
index ee210760d..87dddf494 100644
--- a/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
+++ b/core/src/main/resources/template/css_xhtml/checkboxlist.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/checkboxlist.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
diff --git a/core/src/main/resources/template/css_xhtml/combobox.ftl b/core/src/main/resources/template/css_xhtml/combobox.ftl
index 8123dd2c4..e905e0504 100644
--- a/core/src/main/resources/template/css_xhtml/combobox.ftl
+++ b/core/src/main/resources/template/css_xhtml/combobox.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/combobox.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
diff --git a/core/src/main/resources/template/css_xhtml/control-close.ftl b/core/src/main/resources/template/css_xhtml/control-close.ftl
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/template/css_xhtml/control.ftl b/core/src/main/resources/template/css_xhtml/control.ftl
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
new file mode 100644
index 000000000..ee3c8bb1b
--- /dev/null
+++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
@@ -0,0 +1,50 @@
+<#--
+	Only show message if errors are available.
+	This will be done if ActionSupport is used.
+-->
+<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/> 
+<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
+	
+<#if hasFieldErrors>
+<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
+<#list fieldErrors[parameters.name] as error>
+    <div<#rt/>
+    <#if parameters.id?exists>
+     errorFor="${parameters.id}"<#rt/>
+    </#if>
+    class="errorMessage">
+             ${error?html}
+    </div><#t/>
+</#list>
+</div><#t/>
+</#if>
+
+<#if parameters.label?exists>
+<#if parameters.labelposition?default("top") == 'top'>
+<div <#rt/>
+<#else>
+<span <#rt/>
+</#if>
+<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
+    <label <#t/>
+<#if parameters.id?exists>
+        for="${parameters.id?html}" <#t/>
+</#if>
+<#if hasFieldErrors>
+        class="errorLabel"<#t/>
+<#else>
+        class="label"<#t/>
+</#if>
+    ><#t/>
+<#if parameters.required?default(false)>
+        <span class="required">*</span><#t/>
+</#if>
+        ${parameters.label?html}:
+<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
+	</label><#t/>
+<#if parameters.labelposition?default("top") == 'top'>
+</div> <br/><#rt/>
+<#else>
+</span> <#rt/>
+</#if>
+</#if>
diff --git a/core/src/main/resources/template/css_xhtml/controlheader.ftl b/core/src/main/resources/template/css_xhtml/controlheader.ftl
index 1e4c7d2d8..d564d4935 100644
--- a/core/src/main/resources/template/css_xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlheader.ftl
@@ -1,54 +1,4 @@
-<#--
-	Only show message if errors are available.
-	This will be done if ActionSupport is used.
--->
-<#assign hasFieldErrors = parameters.name?exists && fieldErrors?exists && fieldErrors[parameters.name]?exists/> 
-<div <#rt/><#if parameters.id?exists>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
-	
-<#if hasFieldErrors>
-<div <#rt/><#if parameters.id?exists>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
-<#list fieldErrors[parameters.name] as error>
-    <div<#rt/>
-    <#if parameters.id?exists>
-     errorFor="${parameters.id}"<#rt/>
-    </#if>
-    class="errorMessage">
-             ${error?html}
-    </div><#t/>
-</#list>
-</div><#t/>
-</#if>
-
-<#if parameters.label?exists>
-<#if parameters.labelposition?default("top") == 'top'>
-<div <#rt/>
-<#else>
-<span <#rt/>
-</#if>
-<#if parameters.id?exists>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
-    <label <#t/>
-<#if parameters.id?exists>
-        for="${parameters.id?html}" <#t/>
-</#if>
-<#if hasFieldErrors>
-        class="errorLabel"<#t/>
-<#else>
-        class="label"<#t/>
-</#if>
-    ><#t/>
-<#if parameters.required?default(false)>
-        <span class="required">*</span><#t/>
-</#if>
-        ${parameters.label?html}:
-<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
-	</label><#t/>
-<#if parameters.labelposition?default("top") == 'top'>
-</div> <br/><#rt/>
-<#else>
-</span> <#rt/>
-</#if>
-</#if>
-
+<#include "/${parameters.templateDir}/css_xhtml/controlheader-core.ftl">
 <#if parameters.labelposition?default("top") == 'top'>
 <div <#rt/>
 <#else>
diff --git a/core/src/main/resources/template/css_xhtml/datepicker.ftl b/core/src/main/resources/template/css_xhtml/datepicker.ftl
index 699c7ba10..a9815e592 100644
--- a/core/src/main/resources/template/css_xhtml/datepicker.ftl
+++ b/core/src/main/resources/template/css_xhtml/datepicker.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/datepicker.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/doubleselect.ftl b/core/src/main/resources/template/css_xhtml/doubleselect.ftl
index e761c4e33..51f20533b 100644
--- a/core/src/main/resources/template/css_xhtml/doubleselect.ftl
+++ b/core/src/main/resources/template/css_xhtml/doubleselect.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/doubleselect.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /><#nt/>
diff --git a/core/src/main/resources/template/css_xhtml/file.ftl b/core/src/main/resources/template/css_xhtml/file.ftl
index 32392408c..339747496 100644
--- a/core/src/main/resources/template/css_xhtml/file.ftl
+++ b/core/src/main/resources/template/css_xhtml/file.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/file.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/form-close.ftl b/core/src/main/resources/template/css_xhtml/form-close.ftl
index 393274c30..61a53dd7b 100644
--- a/core/src/main/resources/template/css_xhtml/form-close.ftl
+++ b/core/src/main/resources/template/css_xhtml/form-close.ftl
@@ -1,2 +1,3 @@
+<#include "/${parameters.templateDir}/xhtml/control-close.ftl" />
 <#include "/${parameters.templateDir}/simple/form-close.ftl" />
 <#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/form.ftl b/core/src/main/resources/template/css_xhtml/form.ftl
index d947f065f..d07d86fff 100644
--- a/core/src/main/resources/template/css_xhtml/form.ftl
+++ b/core/src/main/resources/template/css_xhtml/form.ftl
@@ -1,2 +1,3 @@
 <#include "/${parameters.templateDir}/css_xhtml/form-validate.ftl" />
 <#include "/${parameters.templateDir}/simple/form.ftl" />
+<#include "/${parameters.templateDir}/css_xhtml/control.ftl">
diff --git a/core/src/main/resources/template/css_xhtml/label.ftl b/core/src/main/resources/template/css_xhtml/label.ftl
index 8a8f6cd2c..c7255d4bc 100644
--- a/core/src/main/resources/template/css_xhtml/label.ftl
+++ b/core/src/main/resources/template/css_xhtml/label.ftl
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <label<#rt/>
 <#if parameters.id?exists>
  id="${parameters.id?html}"<#rt/>
diff --git a/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl b/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
index 6278f0ab9..6330f0108 100644
--- a/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
+++ b/core/src/main/resources/template/css_xhtml/optiontransferselect.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/optiontransferselect.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/password.ftl b/core/src/main/resources/template/css_xhtml/password.ftl
index a86e6ae5d..5ef91d325 100644
--- a/core/src/main/resources/template/css_xhtml/password.ftl
+++ b/core/src/main/resources/template/css_xhtml/password.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/password.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/radiomap.ftl b/core/src/main/resources/template/css_xhtml/radiomap.ftl
index b4c6af35a..6ee4092de 100644
--- a/core/src/main/resources/template/css_xhtml/radiomap.ftl
+++ b/core/src/main/resources/template/css_xhtml/radiomap.ftl
@@ -1,4 +1,5 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/radiomap.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
 <#nt/>
diff --git a/core/src/main/resources/template/css_xhtml/richtexteditor.ftl b/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
index 24f756702..b16df9058 100644
--- a/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
+++ b/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/richtexteditor.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/select.ftl b/core/src/main/resources/template/css_xhtml/select.ftl
index ab9696a58..17c7fccbb 100644
--- a/core/src/main/resources/template/css_xhtml/select.ftl
+++ b/core/src/main/resources/template/css_xhtml/select.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/select.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/text.ftl b/core/src/main/resources/template/css_xhtml/text.ftl
index 8507a2187..e163af327 100644
--- a/core/src/main/resources/template/css_xhtml/text.ftl
+++ b/core/src/main/resources/template/css_xhtml/text.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" / -->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/text.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/textarea.ftl b/core/src/main/resources/template/css_xhtml/textarea.ftl
index d2d12efae..fc84928a3 100644
--- a/core/src/main/resources/template/css_xhtml/textarea.ftl
+++ b/core/src/main/resources/template/css_xhtml/textarea.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/textarea.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/css_xhtml/updownselect.ftl b/core/src/main/resources/template/css_xhtml/updownselect.ftl
index 845e7f17a..1b080c8fd 100644
--- a/core/src/main/resources/template/css_xhtml/updownselect.ftl
+++ b/core/src/main/resources/template/css_xhtml/updownselect.ftl
@@ -1,3 +1,4 @@
-<#include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" />
+<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
 <#include "/${parameters.templateDir}/simple/updownselect.ftl" />
 <#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/xhtml/control-close.ftl b/core/src/main/resources/template/xhtml/control-close.ftl
new file mode 100644
index 000000000..94eb82e7a
--- /dev/null
+++ b/core/src/main/resources/template/xhtml/control-close.ftl
@@ -0,0 +1 @@
+</table>
\ No newline at end of file
diff --git a/core/src/main/resources/template/xhtml/control.ftl b/core/src/main/resources/template/xhtml/control.ftl
new file mode 100644
index 000000000..2afb56448
--- /dev/null
+++ b/core/src/main/resources/template/xhtml/control.ftl
@@ -0,0 +1,4 @@
+<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
+<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+>
\ No newline at end of file
diff --git a/core/src/main/resources/template/xhtml/form-close.ftl b/core/src/main/resources/template/xhtml/form-close.ftl
index 33468a1a1..61a53dd7b 100644
--- a/core/src/main/resources/template/xhtml/form-close.ftl
+++ b/core/src/main/resources/template/xhtml/form-close.ftl
@@ -1,3 +1,3 @@
-</table>
+<#include "/${parameters.templateDir}/xhtml/control-close.ftl" />
 <#include "/${parameters.templateDir}/simple/form-close.ftl" />
 <#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" />
diff --git a/core/src/main/resources/template/xhtml/form.ftl b/core/src/main/resources/template/xhtml/form.ftl
index 51f70b0a8..ceca51620 100644
--- a/core/src/main/resources/template/xhtml/form.ftl
+++ b/core/src/main/resources/template/xhtml/form.ftl
@@ -1,6 +1,3 @@
 <#include "/${parameters.templateDir}/xhtml/form-validate.ftl" />
 <#include "/${parameters.templateDir}/simple/form.ftl" />
-<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
-<#if parameters.cssStyle?exists> style="${parameters.cssStyle?html}"<#rt/>
-</#if>
->
+<#include "/${parameters.templateDir}/xhtml/control.ftl" />