diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
index 5f35be646d..6b6791b1c5 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
@@ -583,11 +583,13 @@ public class CreateFormWizard
     */
    public String removeUploadedSchemaFile()
    {
+      LOGGER.debug("removing uploaded rendering engine template file " + 
+                   this.getRenderingEngineTemplateFileName());
       this.clearUpload(FILE_SCHEMA);
       this.schemaRootElementNameChoices = null;
       this.schema = null;
       this.schemaFileName = null;
-      
+      assert this.getSchemaFileName() == null;
       // refresh the current page
       return null;
    }
@@ -597,8 +599,11 @@ public class CreateFormWizard
     */
    public String removeUploadedRenderingEngineTemplateFile()
    {
-      clearUpload(FILE_RENDERING_ENGINE_TEMPLATE);
-      
+      LOGGER.debug("removing uploaded rendering engine template file " + 
+                   this.getRenderingEngineTemplateFileName());
+      this.clearUpload(FILE_RENDERING_ENGINE_TEMPLATE);
+      this.renderingEngineTemplateFileName = null;
+      assert this.getRenderingEngineTemplateFileName() == null;
       // refresh the current page
       return null;
    }
diff --git a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
index ae62bddab6..7defb102d0 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
@@ -137,6 +137,7 @@ public class EditFormWizard
             this.new RenderingEngineTemplateData(ret);
          this.renderingEngineTemplates.add(data);
       }
+      this.removedRenderingEngineTemplates = null;
    }
    
    /**
@@ -192,7 +193,7 @@ public class EditFormWizard
 
       if (this.getSchemaFile() != null)
       {
-         FileInfo fileInfo = 
+         final FileInfo fileInfo = 
             this.fileFolderService.create(formNodeRef,
                                           this.getSchemaFileName(),
                                           ContentModel.TYPE_CONTENT);
@@ -211,13 +212,16 @@ public class EditFormWizard
 
       if (this.removedRenderingEngineTemplates != null)
       {
-         for (RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
+         for (final RenderingEngineTemplateData retd : this.removedRenderingEngineTemplates)
          {
+            LOGGER.debug("removing rendering engine template " + retd);
+            assert retd != null;
+            assert retd.getNodeRef() != null;
             this.nodeService.removeChild(formNodeRef, retd.getNodeRef());
          }
       }
 
-      for (RenderingEngineTemplateData retd : this.renderingEngineTemplates)
+      for (final RenderingEngineTemplateData retd : this.renderingEngineTemplates)
       {
          if (retd.getFile() != null)
          {
diff --git a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
index a5fc18e72b..deb23f42c4 100644
--- a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
+++ b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
@@ -32,6 +32,7 @@ import freemarker.template.TemplateModelException;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.*;
 import javax.faces.context.FacesContext;
@@ -57,6 +58,7 @@ import org.alfresco.service.cmr.remote.AVMRemote;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.wcm.AVMConstants;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.context.WebApplicationContext;
@@ -378,10 +380,15 @@ public class RenderingEngineTemplateImpl
                          }
                       }
 
-                      URI uri = null;
                       try
                       {
-                         uri = new URI(webappUrl + (name.charAt(0) == '/' ? name : '/' + name));
+                         final String[] path = (name.startsWith("/") ? name.substring(1) : name).split("/");
+                         for (int i = 0; i < path.length; i++)
+                         {
+                            path[i] = URLEncoder.encode(path[i], "utf-8").replace("+", "%20");
+                         }
+                         
+                         final URI uri = new URI(webappUrl + '/' + StringUtils.join(path, '/'));
                          if (LOGGER.isDebugEnabled())
                             LOGGER.debug("loading " + uri);
                          return uri.toURL().openStream();
diff --git a/source/java/org/alfresco/web/forms/XMLUtil.java b/source/java/org/alfresco/web/forms/XMLUtil.java
index 1c56404ca0..71da4c06a9 100644
--- a/source/java/org/alfresco/web/forms/XMLUtil.java
+++ b/source/java/org/alfresco/web/forms/XMLUtil.java
@@ -149,10 +149,15 @@ public class XMLUtil
       throws SAXException,
       IOException
    {
-      final DocumentBuilder db = XMLUtil.getDocumentBuilder();
-      final Document result = db.parse(source);
-      source.close();
-      return result;
+      try
+      {
+         final DocumentBuilder db = XMLUtil.getDocumentBuilder();
+         return db.parse(source);
+      }
+      finally
+      {
+         source.close();
+      }
    }
 
    /** provides a document builder that is namespace aware but not validating by default */
diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl b/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl
index 3e20f0bf11..cbaeaf0462 100644
--- a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl
+++ b/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.ftl
@@ -54,7 +54,7 @@
 
     <div class="name">Values from xml files generated by in ${alf.parent_path}:</div>
     <ul>
-      <#list alf.parseXMLDocuments('output-method-callout') as d>
+      <#list alf.parseXMLDocuments('form-data-functions-test') as d>
 	<li>
 	  <div class="name">
 	    <#noparse>${d["@alf:file_name"]} = ${d.string}</#noparse>
diff --git a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl b/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl
index c238a3ba16..00a5406552 100644
--- a/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl
+++ b/source/test-resources/xforms/unit-tests/rendering-engine-test/form-data-functions-test.xsl
@@ -85,7 +85,7 @@ body
 
           <div class="name">Values from xml files generated by in <xsl:value-of select="$alf:parent_path"/>:</div>
 	  <ul>
-	  <xsl:for-each select="alf:parseXMLDocuments('output-method-callout')">
+	  <xsl:for-each select="alf:parseXMLDocuments('form-data-functions-test')">
 	    <li>
 	      <div class="name">
 		&lt;xsl:value-of select="@alf:file_name"/&gt; = &lt;xsl:value-of select="string"/&gt;
diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
index bc30605d3f..695ca76cdc 100644
--- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
@@ -1,274 +1,281 @@
-<%--
-   * Copyright (C) 2005-2007 Alfresco Software Limited.
+<!--
+    * Copyright (C) 2005-2007 Alfresco Software Limited.
     
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+    * This program is free software; you can redistribute it and/or
+    * modify it under the terms of the GNU General Public License
+    * as published by the Free Software Foundation; either version 2
+    * of the License, or (at your option) any later version.
 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+    * This program is distributed in the hope that it will be useful,
+    * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    * GNU General Public License for more details.
 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * As a special exception to the terms and conditions of version 2.0 of
- * the GPL, you may redistribute this Program in connection with Free/Libre
- * and Open Source Software ("FLOSS") applications as described in Alfresco's
- * FLOSS exception.  You should have recieved a copy of the text describing
- * the FLOSS exception, and it is also available here:
- * http://www.alfresco.com/legal/licensing"
-  --%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+    * You should have received a copy of the GNU General Public License
+    * along with this program; if not, write to the Free Software
+    * As a special exception to the terms and conditions of version 2.0 of
+    * the GPL, you may redistribute this Program in connection with Free/Libre
+    * and Open Source Software ("FLOSS") applications as described in Alfresco's
+    * FLOSS exception.  You should have recieved a copy of the text describing
+    * the FLOSS exception, and it is also available here:
+    * http://www.alfresco.com/legal/licensing
+  -->
+<jsp:root version="1.2"
+          xmlns:jsp="http://java.sun.com/JSP/Page"
+ 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+          xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+          xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:h="http://java.sun.com/jsf/html">
 
-<jsp:directive.page import="java.io.*"/>
-<jsp:directive.page import="org.alfresco.web.bean.FileUploadBean"/>
-<jsp:directive.page import="org.alfresco.web.bean.wcm.CreateFormWizard"/>
-<jsp:directive.page buffer="32kb" contentType="text/html;charset=UTF-8"/>
-<jsp:directive.page isELIgnored="false"/>
+  <jsp:output doctype-root-element="html"
+	      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+	      doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
-<f:verbatim>
-  <script type="text/javascript" 
-	src="<%=request.getContextPath()%>/scripts/upload_helper.js">
-  </script>
-  <script type="text/javascript">
-  function handle_upload(target)
-  {
-    handle_upload_helper(target, 
-                         "<%= CreateFormWizard.FILE_RENDERING_ENGINE_TEMPLATE %>", 
-                         upload_complete,
-                         "<%= request.getContextPath() %>")
-  }
+  <jsp:directive.page language="java" buffer="32kb" contentType="text/html; charset=UTF-8"/>
+  <jsp:directive.page isELIgnored="false"/>
 
-  function upload_complete(id, path, filename)
-  {
-    var rendering_engine_template_file_input = 
-      document.getElementById("wizard:wizard-body:rendering-engine-template-file");
-    rendering_engine_template_file_input.value = filename;
-    rendering_engine_template_file_input.form.submit();
-  }
-  </script>
-</f:verbatim>
+  <jsp:directive.page import="java.io.*"/>
+  <jsp:directive.page import="org.alfresco.web.bean.FileUploadBean"/>
+  <jsp:directive.page import="org.alfresco.web.bean.wcm.CreateFormWizard"/>
 
-<h:inputText id="rendering-engine-template-file" 
-	     value="#{WizardManager.bean.renderingEngineTemplateFileName}" 
-	     immediate="true"
-	     style="display:none;"
-	     valueChangeListener="#{WizardManager.bean.renderingEngineTemplateFileValueChanged}"/>
+  <f:verbatim>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/scripts/upload_helper.js">&#160;</script>
+    <script type="text/javascript">
+      function handle_upload(target)
+      {
+        handle_upload_helper(target, 
+                             "<jsp:expression>CreateFormWizard.FILE_RENDERING_ENGINE_TEMPLATE</jsp:expression>", 
+                             upload_complete,
+                             "${pageContext.request.contextPath}")
+      }
 
-<h:panelGrid id="general-properties-panel-grid" 
-	     columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
-             width="100%">
-  <h:outputText id="step-1-text" 
-		value="1. #{msg.create_form_configure_rendering_engine_templates_step1_desc}" 
-		escape="false" />
-  <h:panelGrid id="panel_grid_3"
-               columns="4" cellpadding="3" cellspacing="3" border="0"
-	       columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
+      function upload_complete(id, path, filename)
+      {
+        var rendering_engine_template_file_input = 
+          document.getElementById("wizard:wizard-body:rendering-engine-template-file");
+        rendering_engine_template_file_input.value = filename;
+        rendering_engine_template_file_input.form.submit();
+      }
+    </script>
+  </f:verbatim>
+
+  <h:inputText id="rendering-engine-template-file" 
+	       value="#{WizardManager.bean.renderingEngineTemplateFileName}" 
+	       immediate="true"
+	       style="display:none;"
+	       valueChangeListener="#{WizardManager.bean.renderingEngineTemplateFileValueChanged}"/>
+
+  <h:panelGrid id="general-properties-panel-grid" 
+	       columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
                width="100%">
-    <h:outputText id="required_image_rendering_engine_template_file"
-                  value="" />
-    <h:outputText id="output_text_rendering_engine_template_file"
-                  value="#{msg.rendering_engine_template_file}:"/>
-    <h:column id="column_rendering_engine_template_file_empty"
-	      rendered="#{empty WizardManager.bean.renderingEngineTemplateFileName}">
-      <f:verbatim><input id="wizard:wizard-body:file-input" 
-			 type="file" 
-			 size="35" 
-			 name="alfFileInput" 
-			 onchange="javascript:handle_upload(this)"/></f:verbatim>
+    <h:outputText id="step-1-text" 
+		  value="1. #{msg.create_form_configure_rendering_engine_templates_step1_desc}" 
+		  escape="false" />
+    <h:panelGrid id="panel_grid_3"
+                 columns="4" cellpadding="3" cellspacing="3" border="0" width="100%"
+	         columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn">
+
+      <h:outputText id="required_image_rendering_engine_template_file"
+                    value="" />
+      <h:outputText id="output_text_rendering_engine_template_file"
+                    value="#{msg.rendering_engine_template_file}:"/>
+      <h:column id="column_rendering_engine_template_file_empty"
+	        rendered="#{empty WizardManager.bean.renderingEngineTemplateFileName}">
+        <f:verbatim><input id="wizard:wizard-body:file-input" 
+			   type="file" 
+			   size="35" 
+			   name="alfFileInput" 
+			   onchange="javascript:handle_upload(this)"/></f:verbatim>
+        
+      </h:column>
+      <h:column id="column_rendering_engine_template_file_not_empty"
+	        rendered="#{!empty WizardManager.bean.renderingEngineTemplateFileName}">
+        <h:outputText id="rendering-engine-template-file-name"
+                      value="#{WizardManager.bean.renderingEngineTemplateFileName}"/>
+        <h:outputText id="output_text_rendering_engine_template_space"
+                      value="&#160;"
+		      escape="false"/>
+        <a:actionLink id="action_link_remove_rendering_engine_template"
+		      image="/images/icons/delete.gif" 
+                      value="#{msg.remove}" 
+                      action="#{WizardManager.bean.removeUploadedRenderingEngineTemplateFile}"
+                      showLink="false" 
+		      target="top"/>
+      </h:column>
+      <!-- we need to include this invisible image in order to get the column to size correctly -->
+      <h:graphicImage id="invisible_img_rendering_engine_template_file_help"
+		      value="/images/icons/Help_icon.gif" style="cursor:help; visibility: hidden;"/>
+    </h:panelGrid>
+
+    <h:outputText id="step-2-text" 
+		  value="2. #{msg.create_form_configure_rendering_engine_templates_step2_desc}" 
+		  escape="false" />
+    <h:panelGrid id="panel_grid_specify_details"
+                 columns="4" cellpadding="3" cellspacing="3" border="0" width="100%"
+	         columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn,panelGridRequiredImageColumn">
+
+
+      <h:graphicImage id="required-image-rendering-engine"
+                      value="/images/icons/required_field.gif" 
+                      alt="#{msg.required_field}" 
+                      rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
+      <h:outputText id="not-required-rendering-engine" 
+                    value=""
+                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
+      <h:outputText id="rendering-engine-output-text"
+                    value="#{msg.rendering_engine}:"/>
+      <h:selectOneRadio id="rendering-engine" 
+		        value="#{WizardManager.bean.renderingEngineName}"
+                        disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}">
+        <f:selectItems id="rendering-engine-choices"
+		       value="#{WizardManager.bean.renderingEngineChoices}"/>
+      </h:selectOneRadio>
+      <h:column id="rendering-engine-help"/>
+
+      <h:graphicImage id="required-image-name"
+                      value="/images/icons/required_field.gif" 
+                      alt="#{msg.required_field}" 
+                      rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
+      <h:outputText id="not-required-name" 
+                    value=""
+                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
+      <h:outputText id="name-output-text"
+                    value="#{msg.name}:"/>
+      <h:inputText id="name" 
+		   value="#{WizardManager.bean.renderingEngineTemplateName}"
+                   disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
+                   maxlength="1024" 
+		   size="35"/>
+      <h:column id="name-help"/>
+
+      <h:outputText id="no_graphic_image_title" value=""/>
+      <h:outputText id="title-output-text"
+                    value="#{msg.title}:"/>
+      <h:inputText id="title" 
+		   value="#{WizardManager.bean.renderingEngineTemplateTitle}"
+                   disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
+                   maxlength="1024" 
+		   size="35"/>
+      <h:column id="title-help"/>
+
+      <h:outputText id="no_graphic_image_description" value=""/>
+      <h:outputText id="description-output-text"
+                    value="#{msg.description}:"/>
+      <h:inputText id="description" 
+		   value="#{WizardManager.bean.renderingEngineTemplateDescription}"
+                   disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
+                   maxlength="1024" 
+		   style="width:100%"/>
+      <h:column id="description-help"/>
+
+      <h:graphicImage id="required-image-mimetype"
+                      value="/images/icons/required_field.gif" 
+                      alt="#{msg.required_field}" 
+                      rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
+      <h:outputText id="not-required-mimetype" 
+                    value=""
+                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
+      <h:outputText id="mimetype-output-text"
+		    value="#{msg.mimetype_for_renditions}:"/>
+      <h:selectOneMenu id="mimetype"
+                       disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
+		       valueChangeListener="#{WizardManager.bean.mimetypeForRenditionChanged}" 
+		       value="#{WizardManager.bean.mimetypeForRendition}">
+        <f:selectItems id="mimetype-choices"
+		       value="#{WizardManager.bean.mimeTypeChoices}" />
+      </h:selectOneMenu>
+      <h:column id="mimetype-help"/>
+
+      <h:graphicImage id="required-image-output-path-pattern"
+                      value="/images/icons/required_field.gif"
+                      rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"
+                      alt="#{msg.required_field}" />
+      <h:outputText id="not-required-output-path-patern" 
+                    value=""
+                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
+      <h:outputText id="output-path-pattern-output-text"
+                    value="#{msg.output_path_pattern}:"/>
+      <h:inputText id="output-path-pattern" 
+                   disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
+		   value="#{WizardManager.bean.outputPathPatternForRendition}"
+		   style="width:100%;"/>
+      <h:graphicImage id="graphic_image_output_path_pattern_help"
+		      value="/images/icons/Help_icon.gif" style="cursor:help"
+		      onclick="javascript:toggleOutputPathPatternHelp()" />
+
+      <h:column id="output_path_pattern_help_empty_col_1"/>
+      <h:column id="output_path_pattern_help_empty_col_2"/>
+      <f:verbatim>
+        <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
+      </f:verbatim>
+      <h:column id="output_path_pattern_help_empty_col_3"/>
+    </h:panelGrid>
+
+    <h:panelGroup id="step-3-panel-group" styleClass="mainSubText">
+      <h:outputText id="step-3-output-text" value="3. " />
+      <h:commandButton id="add-to-list-button" 
+		       value="#{msg.add_to_list_button}" 
+		       actionListener="#{WizardManager.bean.addSelectedRenderingEngineTemplate}" 
+		       styleClass="wizardButton" 
+		       disabled="#{WizardManager.bean.addToListDisabled}" />
+    </h:panelGroup>
+    <h:panelGroup id="data-table-panel-group">
+      <h:dataTable id="rendering-engine-template-data-table"
+                   value="#{WizardManager.bean.renderingEngineTemplatesDataModel}" var="row" 
+                   rowClasses="selectedItemsRow,selectedItemsRowAlt"
+                   styleClass="selectedItems" headerClass="selectedItemsHeader"
+                   cellspacing="0" cellpadding="4" width="100%"
+                   rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount != 0}">
+        <h:column id="data-table-column-0">
+          <f:facet name="header">
+            <h:outputText id="data-table-name-0" value="#{msg.selected_rendering_engine_templates}" />
+          </f:facet>
+          <f:verbatim>
+            <img style="float: left" src="${pageContext.request.contextPath}/images/icons/template_large.gif"/>
+          </f:verbatim>
+          <h:panelGrid id="panel_grid_row"
+                       columns="2" cellspacing="1" border="0">
+            <h:outputText id="data-table-name-0-name" value="#{msg.name}: " />
+            <h:outputText id="data-table-value-0-name" value="#{row.name}" />
+
+            <h:outputText id="data-table-name-0-type" value="#{msg.type}: " />
+            <h:outputText id="data-table-value-0-type" value="#{row.renderingEngine.name}" />
+
+            <h:outputText id="data-table-name-0-title" value="#{msg.title}: " />
+            <h:outputText id="data-table-value-0-title" value="#{row.title}" />
+
+            <h:outputText id="data-table-name-0-description" value="#{msg.description}: " />
+            <h:outputText id="data-table-value-0-description-empty" style="font-style:italic"
+                          rendered="#{empty row.description}" value="#{msg.description_not_set}" />
+            <h:outputText id="data-table-value-0-description-not-empty" 
+                          rendered="#{!empty row.description}" value="#{row.description}" />
+
+            <h:outputText id="data-table-name-0-mimetype" value="#{msg.mimetype_for_renditions}: " />
+            <h:outputText id="data-table-value-0-mimetype" value="#{row.mimetypeForRendition}" />
+
+            <h:outputText id="data-table-name-0-opp" value="#{msg.output_path_pattern}: " />
+            <h:outputText id="data-table-value-0-opp" value="#{row.outputPathPatternForRendition}" />
+	  </h:panelGrid>
+        </h:column>
+        <h:column id="data-table-column-5">
+          <a:actionLink id="remove-select-rendering-engine-action-link"
+		        actionListener="#{WizardManager.bean.removeSelectedRenderingEngineTemplate}" 
+	                image="/images/icons/delete.gif" value="#{msg.remove}" showLink="false" style="padding:4px" />
+        </h:column>
+      </h:dataTable>
       
-    </h:column>
-    <h:column id="column_rendering_engine_template_file_not_empty"
-	      rendered="#{!empty WizardManager.bean.renderingEngineTemplateFileName}">
-      <h:outputText id="rendering-engine-template-file-name"
-                    value="#{WizardManager.bean.renderingEngineTemplateFileName}"/>
-      <h:outputText id="output_text_rendering_engine_template_space"
-                    value="&nbsp;"
-		    escape="false"/>
-      <a:actionLink id="action_link_remove_rendering_engine_template"
-		    image="/images/icons/delete.gif" 
-                    value="#{msg.remove}" 
-                    action="#{WizardManager.bean.removeUploadedRenderingEngineTemplateFile}"
-                    showLink="false" 
-		    target="top"/>
-    </h:column>
-    <%-- we need to include this invisible image in order to get the column to size correctly --%>
-    <h:graphicImage id="invisible_img_rendering_engine_template_file_help"
-		    value="/images/icons/Help_icon.gif" style="cursor:help; visibility: hidden;"/>
+      <a:panel id="no-items" rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount == 0}">
+        <h:panelGrid id="no-items-panel-grid" 
+		     columns="1" 
+		     cellpadding="2" 
+		     styleClass="selectedItems" 
+		     width="100%"
+		     rowClasses="selectedItemsHeader,selectedItemsRow">
+          <h:outputText id="no-items-name" value="#{msg.selected_rendering_engine_templates}" />
+          <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
+        </h:panelGrid>
+      </a:panel>
+    </h:panelGroup>
   </h:panelGrid>
-
-  <h:outputText id="step-2-text" 
-		value="2. #{msg.create_form_configure_rendering_engine_templates_step2_desc}" 
-		escape="false" />
-  <h:panelGrid id="panel_grid_specify_details"
-               columns="4" cellpadding="3" cellspacing="3" border="0"
-	       columnClasses="panelGridRequiredImageColumn,panelGridLabelColumn,panelGridValueColumn,panelGridRequiredImageColumn">
-               width="100%">
-
-    <h:graphicImage id="required-image-rendering-engine"
-                    value="/images/icons/required_field.gif" 
-                    alt="#{msg.required_field}" 
-                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
-    <h:outputText id="not-required-rendering-engine" 
-                  value=""
-                  rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
-    <h:outputText id="rendering-engine-output-text"
-                  value="#{msg.rendering_engine}:"/>
-    <h:selectOneRadio id="rendering-engine" 
-		      value="#{WizardManager.bean.renderingEngineName}"
-                      disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}">
-      <f:selectItems id="rendering-engine-choices"
-		     value="#{WizardManager.bean.renderingEngineChoices}"/>
-    </h:selectOneRadio>
-    <h:column id="rendering-engine-help"/>
-
-    <h:graphicImage id="required-image-name"
-                    value="/images/icons/required_field.gif" 
-                    alt="#{msg.required_field}" 
-                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
-    <h:outputText id="not-required-name" 
-                  value=""
-                  rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
-    <h:outputText id="name-output-text"
-                  value="#{msg.name}:"/>
-    <h:inputText id="name" 
-		 value="#{WizardManager.bean.renderingEngineTemplateName}"
-                 disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
-                 maxlength="1024" 
-		 size="35"/>
-    <h:column id="name-help"/>
-
-    <h:outputText id="no_graphic_image_title" value=""/>
-    <h:outputText id="title-output-text"
-                  value="#{msg.title}:"/>
-    <h:inputText id="title" 
-		 value="#{WizardManager.bean.renderingEngineTemplateTitle}"
-                 disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
-                 maxlength="1024" 
-		 size="35"/>
-    <h:column id="title-help"/>
-
-    <h:outputText id="no_graphic_image_description" value=""/>
-    <h:outputText id="description-output-text"
-                  value="#{msg.description}:"/>
-    <h:inputText id="description" 
-		 value="#{WizardManager.bean.renderingEngineTemplateDescription}"
-                 disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
-                 maxlength="1024" 
-		 style="width:100%"/>
-    <h:column id="description-help"/>
-
-    <h:graphicImage id="required-image-mimetype"
-                    value="/images/icons/required_field.gif" 
-                    alt="#{msg.required_field}" 
-                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"/>
-    <h:outputText id="not-required-mimetype" 
-                  value=""
-                  rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
-    <h:outputText id="mimetype-output-text"
-		  value="#{msg.mimetype_for_renditions}:"/>
-    <h:selectOneMenu id="mimetype"
-                     disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
-		     valueChangeListener="#{WizardManager.bean.mimetypeForRenditionChanged}" 
-		     value="#{WizardManager.bean.mimetypeForRendition}">
-      <f:selectItems id="mimetype-choices"
-		     value="#{WizardManager.bean.mimeTypeChoices}" />
-    </h:selectOneMenu>
-    <h:column id="mimetype-help"/>
-
-    <h:graphicImage id="required-image-output-path-pattern"
-                    value="/images/icons/required_field.gif"
-                    rendered="#{WizardManager.bean.renderingEngineTemplateFileName != null}"
-                    alt="#{msg.required_field}" />
-    <h:outputText id="not-required-output-path-patern" 
-                  value=""
-                  rendered="#{WizardManager.bean.renderingEngineTemplateFileName == null}"/>
-    <h:outputText id="output-path-pattern-output-text"
-                  value="#{msg.output_path_pattern}:"/>
-    <h:inputText id="output-path-pattern" 
-                 disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
-		 value="#{WizardManager.bean.outputPathPatternForRendition}"
-		 style="width:100%;"/>
-    <h:graphicImage id="graphic_image_output_path_pattern_help"
-		    value="/images/icons/Help_icon.gif" style="cursor:help"
-		    onclick="javascript:toggleOutputPathPatternHelp()" />
-
-    <h:column id="output_path_pattern_help_empty_col_1"/>
-    <h:column id="output_path_pattern_help_empty_col_2"/>
-    <f:verbatim>
-      <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
-    </f:verbatim>
-    <h:column id="output_path_pattern_help_empty_col_3"/>
-  </h:panelGrid>
-
-  <h:panelGroup id="step-3-panel-group" styleClass="mainSubText">
-    <h:outputText id="step-3-output-text" value="3. " />
-    <h:commandButton id="add-to-list-button" 
-		     value="#{msg.add_to_list_button}" 
-		     actionListener="#{WizardManager.bean.addSelectedRenderingEngineTemplate}" 
-		     styleClass="wizardButton" 
-		     disabled="#{WizardManager.bean.addToListDisabled}" />
-  </h:panelGroup>
-  <h:panelGroup id="data-table-panel-group">
-    <h:dataTable id="rendering-engine-template-data-table"
-                 value="#{WizardManager.bean.renderingEngineTemplatesDataModel}" var="row" 
-                 rowClasses="selectedItemsRow,selectedItemsRowAlt"
-                 styleClass="selectedItems" headerClass="selectedItemsHeader"
-                 cellspacing="0" cellpadding="4" width="100%"
-                 rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount != 0}">
-      <h:column id="data-table-column-0">
-        <f:facet name="header">
-          <h:outputText id="data-table-name-0" value="#{msg.selected_rendering_engine_templates}" />
-        </f:facet>
-        <f:verbatim>
-          <img style="float: left" src="<%= request.getContextPath() %>/images/icons/template_large.gif"/>
-        </f:verbatim>
-        <h:panelGrid id="panel_grid_row"
-                     columns="2" cellspacing="1" border="0">
-          <h:outputText id="data-table-name-0-name" value="#{msg.name}: " />
-          <h:outputText id="data-table-value-0-name" value="#{row.name}" />
-
-          <h:outputText id="data-table-name-0-type" value="#{msg.type}: " />
-          <h:outputText id="data-table-value-0-type" value="#{row.renderingEngine.name}" />
-
-          <h:outputText id="data-table-name-0-title" value="#{msg.title}: " />
-          <h:outputText id="data-table-value-0-title" value="#{row.title}" />
-
-          <h:outputText id="data-table-name-0-description" value="#{msg.description}: " />
-          <h:outputText id="data-table-value-0-description-empty" style="font-style:italic"
-                        rendered="#{empty row.description}" value="#{msg.description_not_set}" />
-          <h:outputText id="data-table-value-0-description-not-empty" 
-                        rendered="#{!empty row.description}" value="#{row.description}" />
-
-          <h:outputText id="data-table-name-0-mimetype" value="#{msg.mimetype_for_renditions}: " />
-          <h:outputText id="data-table-value-0-mimetype" value="#{row.mimetypeForRendition}" />
-
-          <h:outputText id="data-table-name-0-opp" value="#{msg.output_path_pattern}: " />
-          <h:outputText id="data-table-value-0-opp" value="#{row.outputPathPatternForRendition}" />
-	</h:panelGrid>
-      </h:column>
-      <h:column id="data-table-column-5">
-        <a:actionLink id="remove-select-rendering-engine-action-link"
-		      actionListener="#{WizardManager.bean.removeSelectedRenderingEngineTemplate}" 
-	              image="/images/icons/delete.gif" value="#{msg.remove}" showLink="false" style="padding:4px" />
-      </h:column>
-    </h:dataTable>
-    
-    <a:panel id="no-items" rendered="#{WizardManager.bean.renderingEngineTemplatesDataModel.rowCount == 0}">
-      <h:panelGrid id="no-items-panel-grid" 
-		   columns="1" 
-		   cellpadding="2" 
-		   styleClass="selectedItems" 
-		   width="100%"
-		   rowClasses="selectedItemsHeader,selectedItemsRow">
-        <h:outputText id="no-items-name" value="#{msg.selected_rendering_engine_templates}" />
-        <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
-      </h:panelGrid>
-    </a:panel>
-  </h:panelGroup>
-</h:panelGrid>
+</jsp:root>
diff --git a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
index 186c0e1b5b..ad56f52e3b 100644
--- a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
@@ -1,4 +1,4 @@
-<%--
+<!--
  * Copyright (C) 2005-2007 Alfresco Software Limited.
  
  * This program is free software; you can redistribute it and/or
@@ -19,45 +19,57 @@
  * FLOSS exception.  You should have recieved a copy of the text describing
  * the FLOSS exception, and it is also available here:
  * http://www.alfresco.com/legal/licensing
---%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
-<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-<script type="text/javascript">
-function apply_default_workflow_changed(value)
-{
-  value = String(value) == 'true';
-  document.getElementById("wizard:wizard-body:sdw-pg-2").style.display = value ? "block" : "none";
-}
-</script>
-<h:panelGroup id="sdw-pg-1">
-  <h:outputText id="sdw-question" 
-		value="#{msg.create_form_select_default_workflow_apply_default_workflow}" 
-		escape="false" />
+-->
+<jsp:root version="1.2"
+          xmlns:jsp="http://java.sun.com/JSP/Page"
+ 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+          xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:h="http://java.sun.com/jsf/html">
 
-  <h:selectOneRadio id="sdw-apply-default-workflow-select-one"
-		    required="false"
-		    onchange="apply_default_workflow_changed(this.value)"
-		    value="#{WizardManager.bean.applyDefaultWorkflow}">
-    <f:selectItem itemLabel="#{msg.yes}" itemValue="#{true}"/>
-    <f:selectItem itemLabel="#{msg.no_not_now}" itemValue="#{false}"/>
-  </h:selectOneRadio>
+  <jsp:output doctype-root-element="html"
+	      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+	      doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
-  <f:verbatim><div style="margin-top:10px">&nbsp;</div></f:verbatim>
-  <h:panelGroup id="sdw-pg-2" style="#{WizardManager.bean.applyDefaultWorkflow?'display:block':'display:none'}">
-    <h:outputText id="sdw-select-workflow" 
-  		value="#{msg.create_form_select_default_workflow_select_workflow}:" 
-  		escape="false" />
-    <f:verbatim><div id="workflow-list-div"
-  		     style="margin:5px 0px;height:144px;*height:148px;width:100%;overflow:auto" class="selectListTable"></f:verbatim>
-    <a:selectList id="workflow-list" 
-  		  multiSelect="false" 
-  		  style="width:100%" 
-  		  itemStyleClass="selectListItem"
-  		  value="#{WizardManager.bean.defaultWorkflowName}">
-      <a:listItems value="#{WizardManager.bean.defaultWorkflowChoices}" />
-    </a:selectList>
-    <f:verbatim></div></f:verbatim>
+  <jsp:directive.page language="java" buffer="32kb" contentType="text/html; charset=UTF-8"/>
+  <jsp:directive.page isELIgnored="false"/>
+
+  <script type="text/javascript">
+    function apply_default_workflow_changed(value)
+    {
+      value = String(value) == 'true';
+      document.getElementById("wizard:wizard-body:sdw-pg-2").style.display = value ? "block" : "none";
+    }
+  </script>
+  <h:panelGroup id="sdw-pg-1">
+    <h:outputText id="sdw-question" 
+		  value="#{msg.create_form_select_default_workflow_apply_default_workflow}" 
+		  escape="false" />
+
+    <h:selectOneRadio id="sdw-apply-default-workflow-select-one"
+		      required="false"
+		      onclick="apply_default_workflow_changed(this.value)"
+		      value="#{WizardManager.bean.applyDefaultWorkflow}">
+      <f:selectItem itemLabel="#{msg.yes}" itemValue="#{true}"/>
+      <f:selectItem itemLabel="#{msg.no_not_now}" itemValue="#{false}"/>
+    </h:selectOneRadio>
+
+    <f:verbatim><div style="margin-top:10px">&#160;</div></f:verbatim>
+    <h:panelGroup id="sdw-pg-2" style="#{WizardManager.bean.applyDefaultWorkflow?'display:block':'display:none'}">
+      <h:outputText id="sdw-select-workflow" 
+  		    value="#{msg.create_form_select_default_workflow_select_workflow}:" 
+  		    escape="false" />
+      <h:panelGroup id="workflow-list-div"
+  	            style="margin:5px 0px;height:144px;*height:148px;width:100%;overflow:auto;display:block;" 
+                    styleClass="selectListTable">
+        <a:selectList id="workflow-list" 
+  		      multiSelect="false" 
+  		      style="width:100%" 
+  		      itemStyleClass="selectListItem"
+  		      value="#{WizardManager.bean.defaultWorkflowName}">
+          <a:listItems value="#{WizardManager.bean.defaultWorkflowChoices}" />
+        </a:selectList>
+      </h:panelGroup>
+    </h:panelGroup>
   </h:panelGroup>
-</h:panelGroup>
+</jsp:root>
diff --git a/source/web/jsp/wcm/create-web-content-wizard/create-html.jsp b/source/web/jsp/wcm/create-web-content-wizard/create-html.jsp
index 69d023aaa3..63d6488322 100644
--- a/source/web/jsp/wcm/create-web-content-wizard/create-html.jsp
+++ b/source/web/jsp/wcm/create-web-content-wizard/create-html.jsp
@@ -25,7 +25,6 @@
 <jsp:root version="1.2"
           xmlns:jsp="http://java.sun.com/JSP/Page"
  	  xmlns:c="http://java.sun.com/jsp/jstl/core"
-	  xmlns:pr="http://www.alfresco.org/alfresco/pr"
           xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html">