diff --git a/src/NReco.Dsm.WebForms.Bootstrap/Properties/AssemblyInfo.cs b/src/NReco.Dsm.WebForms.Bootstrap/Properties/AssemblyInfo.cs
index ab760cbb..ef7e4e64 100644
--- a/src/NReco.Dsm.WebForms.Bootstrap/Properties/AssemblyInfo.cs
+++ b/src/NReco.Dsm.WebForms.Bootstrap/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("2.0.3.0")]
+[assembly: AssemblyFileVersion("2.0.3.0")]
diff --git a/src/NReco.Dsm.WebForms.Bootstrap/config/xsl/model-webforms-layout-bootstrap.xsl b/src/NReco.Dsm.WebForms.Bootstrap/config/xsl/model-webforms-layout-bootstrap.xsl
index 36859741..555995b8 100644
--- a/src/NReco.Dsm.WebForms.Bootstrap/config/xsl/model-webforms-layout-bootstrap.xsl
+++ b/src/NReco.Dsm.WebForms.Bootstrap/config/xsl/model-webforms-layout-bootstrap.xsl
@@ -23,7 +23,7 @@ limitations under the License.
 	<xsl:output method='xml' indent='yes' />
 
 	<!--override form layout -->
-	<xsl:template match="l:form" mode="layout-form-template">
+	<xsl:template match="l:*" mode="layout-form-template">
 		<xsl:param name="formClass"/>
 		<xsl:param name="renderFormHeader"/>
 		<xsl:param name="formHeader"/>
diff --git a/src/NReco.Dsm.WebForms/config/xsl/model-webforms-layout-common.xsl b/src/NReco.Dsm.WebForms/config/xsl/model-webforms-layout-common.xsl
index 84631805..61714194 100644
--- a/src/NReco.Dsm.WebForms/config/xsl/model-webforms-layout-common.xsl
+++ b/src/NReco.Dsm.WebForms/config/xsl/model-webforms-layout-common.xsl
@@ -846,7 +846,7 @@ limitations under the License.
 			
 	</xsl:template>
 
-	<xsl:template match="l:form" mode="layout-form-template">
+	<xsl:template match="l:*" mode="layout-form-template">
 		<xsl:param name="formClass"/>
 		<xsl:param name="renderFormHeader"/>
 		<xsl:param name="formHeader"/>