openrat-cms

commit 217551ea25bd8053ee2e3208b9e30a840a784fa0
parent 7c47777e85439463e755432d935fc6f83223dbcf
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 17 Oct 2020 22:24:58 +0200

Fix: XSD must contain all subelements per element; New: Component 'fieldset'.

Diffstat:
M
modules/template_engine/components/XSDGenerator.php
 | 
6
++----
M
modules/template_engine/components/components.ini
 | 
1
+
A
modules/template_engine/components/html/component_fieldset/FieldsetComponent.class.php
 | 
44
++++++++++++++++++++++++++++++++++++++++++++
M
modules/template_engine/components/template.xsd
 | 
1334
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--

4 files changed, 1347 insertions(+), 38 deletions(-)
diff --git a/modules/template_engine/components/XSDGenerator.php b/modules/template_engine/components/XSDGenerator.php
@@ -47,10 +47,8 @@ foreach ($folder as $componentName) {
 
     // Allowed Child-Elements (all)
     fwrite($xsdFile, '<xsd:choice maxOccurs="unbounded" minOccurs="0">');
-    foreach ($folder as $f2) {
-        $filename2 = __DIR__ . '/html/' . $f2 . '/' . ucfirst($f2) . '.class.php';
-        if (is_file($filename2))
-            fwrite($xsdFile, '<xsd:element ref="' . $f2 . '" maxOccurs="unbounded" minOccurs="0" />');
+    foreach ($folder as $cName) {
+		fwrite($xsdFile, '<xsd:element ref="' . $cName . '" maxOccurs="unbounded" minOccurs="0" />');
     }
     fwrite($xsdFile, '</xsd:choice>');
 
diff --git a/modules/template_engine/components/components.ini b/modules/template_engine/components/components.ini
@@ -5,6 +5,7 @@ column =
 date = 
 editor = 
 else = 
+fieldset = 
 form = 
 group = 
 hidden = 
diff --git a/modules/template_engine/components/html/component_fieldset/FieldsetComponent.class.php b/modules/template_engine/components/html/component_fieldset/FieldsetComponent.class.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace template_engine\components\html\component_fieldset;
+
+use template_engine\components\html\Component;
+use template_engine\element\CMSElement;
+use template_engine\element\HtmlElement;
+use template_engine\element\Value;
+use template_engine\element\ValueExpression;
+
+
+/**
+ * A fieldset contains a label (rendered as a 'legend') and a value.
+ * The value contains all elements of the subcomponents.
+ *
+ * @author Jan Dankert
+ */
+class FieldsetComponent extends Component
+{
+	public $label;
+
+
+	/**
+	 * Creates all elements for a fieldset.
+	 *
+	 * @return CMSElement
+	 */
+	public function createElement()
+	{
+		$fieldset = (new CMSElement('fieldset'))->addStyleClass('fieldset');
+
+		$label = (new HtmlElement('legend'))->addStyleClass('fieldset-label')->asChildOf($fieldset);
+
+		if   ( $this->label )
+			$label->content( Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->label) );
+
+		$value = (new HtmlElement('div'))->addStyleClass('fieldset-value')->asChildOf($fieldset);
+
+		$this->adoptiveElement = $value;
+
+		return $fieldset;
+	}
+}+
\ No newline at end of file
diff --git a/modules/template_engine/components/template.xsd b/modules/template_engine/components/template.xsd
@@ -5,7 +5,43 @@
     <!-- generated by XSDGenerator. do not change manually -->
     <xsd:element name="button" type="buttonType"/>
     <xsd:complexType name="buttonType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="type" type="xsd:string"/>
         <xsd:attribute name="class" type="xsd:string"/>
         <xsd:attribute name="src" type="xsd:string"/>
@@ -15,7 +51,43 @@
     </xsd:complexType>
     <xsd:element name="checkbox" type="checkboxType"/>
     <xsd:complexType name="checkboxType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="default" type="xsd:boolean"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="readonly" type="xsd:boolean"/>
@@ -25,7 +97,43 @@
     </xsd:complexType>
     <xsd:element name="column" type="columnType"/>
     <xsd:complexType name="columnType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="width" type="xsd:string"/>
         <xsd:attribute name="style" type="xsd:string"/>
         <xsd:attribute name="class" type="xsd:string"/>
@@ -41,13 +149,85 @@
     </xsd:complexType>
     <xsd:element name="date" type="dateType"/>
     <xsd:complexType name="dateType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="date" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="editor" type="editorType"/>
     <xsd:complexType name="editorType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="type" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="mode" type="xsd:string"/>
@@ -60,12 +240,126 @@
     </xsd:complexType>
     <xsd:element name="else" type="elseType"/>
     <xsd:complexType name="elseType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
+        <xsd:attribute name="request" type="xsd:string"/>
+    </xsd:complexType>
+    <xsd:element name="fieldset" type="fieldsetType"/>
+    <xsd:complexType name="fieldsetType">
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
+        <xsd:attribute name="label" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="form" type="formType"/>
     <xsd:complexType name="formType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="method" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="action" type="xsd:string"/>
@@ -87,7 +381,43 @@
     </xsd:complexType>
     <xsd:element name="group" type="groupType"/>
     <xsd:complexType name="groupType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="open" type="xsd:boolean"/>
         <xsd:attribute name="show" type="xsd:boolean"/>
         <xsd:attribute name="title" type="xsd:string"/>
@@ -96,7 +426,43 @@
     </xsd:complexType>
     <xsd:element name="hidden" type="hiddenType"/>
     <xsd:complexType name="hiddenType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="default" type="xsd:string"/>
         <xsd:attribute name="prefix" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
@@ -106,7 +472,43 @@
     </xsd:complexType>
     <xsd:element name="if" type="ifType"/>
     <xsd:complexType name="ifType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="true" type="xsd:string"/>
         <xsd:attribute name="false" type="xsd:string"/>
         <xsd:attribute name="contains" type="xsd:string"/>
@@ -121,7 +523,43 @@
     </xsd:complexType>
     <xsd:element name="image" type="imageType"/>
     <xsd:complexType name="imageType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="class" type="xsd:string"/>
         <xsd:attribute name="menu" type="xsd:string"/>
         <xsd:attribute name="action" type="xsd:string"/>
@@ -142,13 +580,85 @@
     </xsd:complexType>
     <xsd:element name="include" type="includeType"/>
     <xsd:complexType name="includeType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="file" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="input" type="inputType"/>
     <xsd:complexType name="inputType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="default" type="xsd:string"/>
         <xsd:attribute name="type" type="xsd:string"/>
         <xsd:attribute name="index" type="xsd:string"/>
@@ -170,7 +680,43 @@
     </xsd:complexType>
     <xsd:element name="inputarea" type="inputareaType"/>
     <xsd:complexType name="inputareaType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="rows" type="xsd:int"/>
         <xsd:attribute name="cols" type="xsd:int"/>
         <xsd:attribute name="value" type="xsd:string"/>
@@ -188,7 +734,43 @@
     </xsd:complexType>
     <xsd:element name="insert" type="insertType"/>
     <xsd:complexType name="insertType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="url" type="xsd:string"/>
         <xsd:attribute name="function" type="xsd:string"/>
@@ -196,7 +778,43 @@
     </xsd:complexType>
     <xsd:element name="label" type="labelType"/>
     <xsd:complexType name="labelType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="for" type="xsd:string"/>
         <xsd:attribute name="value" type="xsd:string"/>
         <xsd:attribute name="key" type="xsd:string"/>
@@ -205,7 +823,43 @@
     </xsd:complexType>
     <xsd:element name="link" type="linkType"/>
     <xsd:complexType name="linkType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="var1" type="xsd:string"/>
         <xsd:attribute name="var2" type="xsd:string"/>
         <xsd:attribute name="var3" type="xsd:string"/>
@@ -235,7 +889,43 @@
     </xsd:complexType>
     <xsd:element name="list" type="listType"/>
     <xsd:complexType name="listType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="list" type="xsd:string"/>
         <xsd:attribute name="extract" type="xsd:boolean"/>
         <xsd:attribute name="key" type="xsd:string"/>
@@ -244,23 +934,167 @@
     </xsd:complexType>
     <xsd:element name="logo" type="logoType"/>
     <xsd:complexType name="logoType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="newline" type="newlineType"/>
     <xsd:complexType name="newlineType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="output" type="outputType"/>
     <xsd:complexType name="outputType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="part" type="partType"/>
     <xsd:complexType name="partType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="class" type="xsd:string"/>
         <xsd:attribute name="id" type="xsd:string"/>
         <xsd:attribute name="tag" type="xsd:string"/>
@@ -268,7 +1102,43 @@
     </xsd:complexType>
     <xsd:element name="password" type="passwordType"/>
     <xsd:complexType name="passwordType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="default" type="xsd:string"/>
         <xsd:attribute name="size" type="xsd:int"/>
         <xsd:attribute name="maxlength" type="xsd:int"/>
@@ -280,13 +1150,85 @@
     </xsd:complexType>
     <xsd:element name="qrcode" type="qrcodeType"/>
     <xsd:complexType name="qrcodeType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="value" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="radio" type="radioType"/>
     <xsd:complexType name="radioType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="readonly" type="xsd:boolean"/>
         <xsd:attribute name="value" type="xsd:string"/>
         <xsd:attribute name="prefix" type="xsd:string"/>
@@ -301,7 +1243,43 @@
     </xsd:complexType>
     <xsd:element name="radiobox" type="radioboxType"/>
     <xsd:complexType name="radioboxType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="list" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="default" type="xsd:string"/>
@@ -312,14 +1290,86 @@
     </xsd:complexType>
     <xsd:element name="row" type="rowType"/>
     <xsd:complexType name="rowType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="class" type="xsd:string"/>
         <xsd:attribute name="id" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>
     </xsd:complexType>
     <xsd:element name="selectbox" type="selectboxType"/>
     <xsd:complexType name="selectboxType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="list" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="default" type="xsd:string"/>
@@ -334,7 +1384,43 @@
     </xsd:complexType>
     <xsd:element name="selector" type="selectorType"/>
     <xsd:complexType name="selectorType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="types" type="xsd:string"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="id" type="xsd:string"/>
@@ -344,7 +1430,43 @@
     </xsd:complexType>
     <xsd:element name="set" type="setType"/>
     <xsd:complexType name="setType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="var" type="xsd:string"/>
         <xsd:attribute name="value" type="xsd:string"/>
         <xsd:attribute name="key" type="xsd:string"/>
@@ -352,7 +1474,43 @@
     </xsd:complexType>
     <xsd:element name="table" type="tableType"/>
     <xsd:complexType name="tableType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="filter" type="xsd:boolean"/>
         <xsd:attribute name="width" type="xsd:string"/>
         <xsd:attribute name="class" type="xsd:string"/>
@@ -360,7 +1518,43 @@
     </xsd:complexType>
     <xsd:element name="text" type="textType"/>
     <xsd:complexType name="textType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="title" type="xsd:string"/>
         <xsd:attribute name="type" type="xsd:string"/>
         <xsd:attribute name="escape" type="xsd:boolean"/>
@@ -371,7 +1565,43 @@
     </xsd:complexType>
     <xsd:element name="upload" type="uploadType"/>
     <xsd:complexType name="uploadType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="size" type="xsd:int"/>
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="multiple" type="xsd:boolean"/>
@@ -381,7 +1611,43 @@
     </xsd:complexType>
     <xsd:element name="user" type="userType"/>
     <xsd:complexType name="userType">
-        <xsd:choice maxOccurs="unbounded" minOccurs="0"></xsd:choice>
+        <xsd:choice maxOccurs="unbounded" minOccurs="0">
+            <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/>
+            <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:choice>
         <xsd:attribute name="user" type="xsd:string"/>
         <xsd:attribute name="id" type="xsd:string"/>
         <xsd:attribute name="request" type="xsd:string"/>