diff --git a/zkwebui/WEB-INF/tld/zk/core.dsp.tld b/zkwebui/WEB-INF/tld/zk/core.dsp.tld
index 71f82ee372..dda8b81018 100755
--- a/zkwebui/WEB-INF/tld/zk/core.dsp.tld
+++ b/zkwebui/WEB-INF/tld/zk/core.dsp.tld
@@ -166,8 +166,18 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
 	java.lang.String outZkHtmlTags()
 		</function-signature>
 		<description>
-	Returns the desktop info to render a desktop.
-	It is required only if outPageAttrs might not be called
+	Returns the ZK specific HTML tags, if not generated yet.
+		</description>
+	</function>
+	<function>
+		<name>outZkHeadHtmlTags</name>
+		<function-class>org.zkoss.zk.fn.ZkFns</function-class>
+		<function-signature>
+	java.lang.String outZkHeadHtmlTags(org.zkoss.zk.ui.Page)
+		</function-signature>
+		<description>
+	Returns the ZK specific HTML tags including the headers defined in the page,
+	if not generated yet
 		</description>
 	</function>
 
@@ -192,7 +202,6 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
 		</description>
 	</function>
 
-	<!-- DSP only -->
 	<function>
 		<name>outLocaleJavaScript</name>
 		<function-class>org.zkoss.zk.fn.DspFns</function-class>
@@ -215,4 +224,37 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.
 	@param deviceType the device type. If null, "ajax" is assumed.
 		</description>
 	</function>
+
+	<function>
+		<name>setCacheControl</name>
+		<function-class>org.zkoss.zk.fn.DspFns</function-class>
+		<function-signature>
+	void setCacheControl(java.lang.String, int)
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for the current request.
+		</description>
+	</function>
+	<function>
+		<name>setCSSCacheControl</name>
+		<function-class>org.zkoss.zk.fn.DspFns</function-class>
+		<function-signature>
+	void setCSSCacheControl()
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for the CSS file
+	from class Web resource for the current request.
+		</description>
+	</function>
+	<function>
+		<name>setCWRCacheControl</name>
+		<function-class>org.zkoss.zk.fn.DspFns</function-class>
+		<function-signature>
+	void setCWRCacheControl()
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for
+	class Web resource for the current request.
+		</description>
+	</function>
 </taglib>
diff --git a/zkwebui/WEB-INF/tld/zk/core.jsp.tld b/zkwebui/WEB-INF/tld/zk/core.jsp.tld
new file mode 100644
index 0000000000..d47d0af049
--- /dev/null
+++ b/zkwebui/WEB-INF/tld/zk/core.jsp.tld
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+Purpose:
+	
+Description:
+	
+Histroy:
+	Tue Oct 20 16:47:28     2009, Created by tomyeh
+
+Copyright (C) 2009 Potix Corporation. All Rights Reserved.
+-->
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+
+	<tlib-version>1.1</tlib-version>
+	<jsp-version>2.0</jsp-version>
+	<short-name>core.jsp</short-name>
+	<uri>http://www.zkoss.org/tld/core.jsp</uri>
+	<description>
+	Methods for JSP pages
+	</description>
+
+	<function>
+		<name>outZkHtmlTags</name>
+		<function-class>org.zkoss.zk.fn.ZkFns</function-class>
+		<function-signature>
+	java.lang.String outZkHtmlTags(ServletContext,
+ 	HttpServletRequest, HttpServletResponse, String)
+		</function-signature>
+		<description>
+	Returns the desktop info to render a desktop.
+	It is required only if outPageAttrs might not be called
+		</description>
+	</function>
+
+	<function>
+		<name>outDeviceStyleSheets</name>
+		<function-class>org.zkoss.zk.fn.JspFns</function-class>
+		<function-signature>
+	java.lang.String outDeviceStyleSheets(ServletContext,
+ 	HttpServletRequest, HttpServletResponse, String)
+		</function-signature>
+		<description>
+	Returns HTML tags to include all style sheets used by the specified device.
+	Note: unlike outLangStyleSheets, it can be called without current execution.
+		</description>
+	</function>
+
+	<function>
+		<name>setCacheControl</name>
+		<function-class>org.zkoss.zk.fn.JspFns</function-class>
+		<function-signature>
+	void setCacheControl(HttpServletResponse, java.lang.String, int)
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for the current request.
+		</description>
+	</function>
+	<function>
+		<name>setCSSCacheControl</name>
+		<function-class>org.zkoss.zk.fn.JspFns</function-class>
+		<function-signature>
+	void setCSSCacheControl(HttpServletResponse)
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for the CSS file
+	from class Web resource for the current request.
+		</description>
+	</function>
+	<function>
+		<name>setCWRCacheControl</name>
+		<function-class>org.zkoss.zk.fn.JspFns</function-class>
+		<function-signature>
+	void setCWRCacheControl(HttpServletResponse)
+		</function-signature>
+		<description>
+	Sets the Cache-Control and Expires headers for
+	class Web resource for the current request.
+		</description>
+	</function>
+</taglib>
diff --git a/zkwebui/WEB-INF/xsd/zul.xsd b/zkwebui/WEB-INF/xsd/zul.xsd
index be20db6dbc..4a6e545103 100644
--- a/zkwebui/WEB-INF/xsd/zul.xsd
+++ b/zkwebui/WEB-INF/xsd/zul.xsd
@@ -883,9 +883,10 @@
 		<xs:attribute name="value" type="dateType" use="optional" />
 		<xs:attribute name="lenient" type="booleanType" use="optional" />
 		<xs:attribute name="compact" type="booleanType" use="optional" />
-		<xs:attribute name="timeZone" type="xs:string" use="optional" />
 		<xs:attribute name="buttonVisible" type="booleanType" use="optional" />
 		<xs:attribute name="open" type="booleanType" use="optional" />
+		<xs:attribute name="displayedTimeZones" type="xs:string" use="optional" />
+		<xs:attribute name="timeZonesReadonly" type="booleanType" use="optional" />
 		<xs:attributeGroup ref="rootAttrGroup" />
 	</xs:complexType>
     <!-- decimalbox -->
@@ -1289,7 +1290,7 @@
 		<xs:attribute name="src" type="xs:string" use="optional" />
 		<xs:attribute name="localized" type="booleanType" use="optional" />
 		<xs:attribute name="progressing" type="booleanType" use="optional" />
-		<xs:attribute name="mode" type="booleanType" use="optional" />
+		<xs:attribute name="mode" type="xs:string" use="optional" />
 		<xs:attributeGroup ref="rootAttrGroup" />
 	</xs:complexType>
     <!-- intbox -->
@@ -1534,6 +1535,7 @@
 		<xs:attributeGroup ref="xulElementAttrGroup" />
 		<xs:attribute name="orient" type="orientAttrType" use="optional" />
 		<xs:attribute name="autodrop" type="booleanType" use="optional" />
+		<xs:attribute name="scrollable" type="booleanType" use="optional" />
 		<xs:attributeGroup ref="rootAttrGroup" />
 	</xs:complexType>
     <!-- menuitem -->
@@ -1603,13 +1605,13 @@
 			use="optional" />
 		<xs:attribute name="closable" type="booleanType" use="optional" />
 		<xs:attribute name="collapsible" type="booleanType" use="optional" />
-		<xs:attribute name="Floatable" type="booleanType" use="optional" />
-		<xs:attribute name="Framable" type="booleanType" use="optional" />
+		<xs:attribute name="floatable" type="booleanType" use="optional" />
+		<xs:attribute name="framable" type="booleanType" use="optional" />
 		<xs:attribute name="maximizable" type="booleanType" use="optional" />
 		<xs:attribute name="maximized" type="booleanType" use="optional" />
 		<xs:attribute name="minimized" type="booleanType" use="optional" />
 		<xs:attribute name="minimizable" type="booleanType" use="optional" />
-		<xs:attribute name="Movable" type="booleanType" use="optional" />
+		<xs:attribute name="movable" type="booleanType" use="optional" />
 		<xs:attribute name="open" type="booleanType" use="optional" />
 		<xs:attribute name="title" type="xs:string" use="optional" />
 	</xs:complexType>
@@ -1965,7 +1967,7 @@
 	<xs:element name="toolbar" type="toolbarType" />
 	<xs:complexType name="toolbarType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:group ref="anyGroup" />
+			<xs:group ref="baseGroup" />
 			<xs:element ref="toolbarbutton" />
 			<xs:element ref="button" />
 			<xs:element ref="image" />