diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 04230296ea..bf51554892 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -14,7 +14,7 @@ url.maven2.lib=http://central.maven.org
 
 url.maven.zkoss=http://mavensync.zkoss.org
 url.maven.zkoss.lib=http://mavensync.zkoss.org
-url.zkoss.osgi=${local.repository.root}/jarfile/zk-p2/zk-8.0.2.2/
+url.zkoss.osgi=${local.repository.root}/jarfile/zk-p2/zk-8.5.0/
 
 url.equinox=http://download.eclipse.org/eclipse/updates/4.7
 url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 69b1856cce..a7d602be1c 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -113,7 +113,10 @@
     	<name>org.zkoss.zul.nativebar</name>
     	<value>true</value>
     </library-property>
-    
+    <library-property>
+        <name>org.zkoss.theme.preferred</name>
+        <value>breeze</value>
+    </library-property>
 	<preference>
     	<name>org.zkoss.zk.ui.WebApp.name</name>
     	<value>iDempiere</value>
diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index 04fc2744bd..8ed566abf2 100644
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/breeze.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/calendar.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index 1279383baa..0eabda59ac 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-ClassPath: lib/calendar.jar,
  lib/gmapsz.jar,
  lib/timelinez.jar,
  lib/timeplotz.jar,
+ lib/breeze.jar,
  .
 Export-Package: metainfo.zk,
  org.zkforge.json.simple,
@@ -28,7 +29,63 @@ Export-Package: metainfo.zk,
  org.zkoss.calendar.impl,
  org.zkoss.gmaps,
  org.zkoss.gmaps.event,
+ org.zkoss.theme.breeze,
  org.zkoss.zul.impl,
+ web.breeze.js.zkex.grid.css,
+ web.breeze.js.zkex.inp.css,
+ web.breeze.js.zkex.layout.css,
+ web.breeze.js.zkex.menu.css,
+ web.breeze.js.zkmax.big.css,
+ web.breeze.js.zkmax.inp.css,
+ web.breeze.js.zkmax.inp.ext,
+ web.breeze.js.zkmax.layout.css,
+ web.breeze.js.zkmax.nav.css,
+ web.breeze.js.zkmax.wgt.css,
+ web.breeze.js.zul.box.css,
+ web.breeze.js.zul.db.css,
+ web.breeze.js.zul.grid.css,
+ web.breeze.js.zul.inp.css,
+ web.breeze.js.zul.layout.css,
+ web.breeze.js.zul.menu.css,
+ web.breeze.js.zul.mesh.css,
+ web.breeze.js.zul.sel.css,
+ web.breeze.js.zul.tab.css,
+ web.breeze.js.zul.wgt.css,
+ web.breeze.js.zul.wnd.css,
+ web.breeze.zkex.img.colorbox,
+ web.breeze.zkmax.css,
+ web.breeze.zkmax.img.big,
+ web.breeze.zkmax.img.inp,
+ web.breeze.zkmax.img.tablet,
+ web.breeze.zkmax.img.tablet.big,
+ web.breeze.zkmax.img.tablet.colorbox,
+ web.breeze.zkmax.img.tablet.grid,
+ web.breeze.zkmax.img.tablet.inp,
+ web.breeze.zkmax.img.tablet.layout,
+ web.breeze.zkmax.img.tablet.menu,
+ web.breeze.zkmax.img.tablet.paging,
+ web.breeze.zkmax.img.tablet.popup,
+ web.breeze.zkmax.img.tablet.tab,
+ web.breeze.zkmax.img.tablet.tree,
+ web.breeze.zkmax.img.tablet.wnd,
+ web.breeze.zul.css,
+ web.breeze.zul.img,
+ web.breeze.zul.img.button,
+ web.breeze.zul.img.common,
+ web.breeze.zul.img.errbox,
+ web.breeze.zul.img.grid,
+ web.breeze.zul.img.input,
+ web.breeze.zul.img.layout,
+ web.breeze.zul.img.menu,
+ web.breeze.zul.img.misc,
+ web.breeze.zul.img.msgbox,
+ web.breeze.zul.img.paging,
+ web.breeze.zul.img.popup,
+ web.breeze.zul.img.slider,
+ web.breeze.zul.img.splt,
+ web.breeze.zul.img.tab,
+ web.breeze.zul.img.tree,
+ web.breeze.zul.img.wnd,
  web.js.calendar,
  web.js.calendar.css,
  web.js.calendar.img,
diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties
index 9f00062129..c8edc6d29e 100644
--- a/org.idempiere.zk.extra/build.properties
+++ b/org.idempiere.zk.extra/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                lib/calendar.jar,\
                lib/gmapsz.jar,\
                lib/timelinez.jar,\
-               lib/timeplotz.jar
+               lib/timeplotz.jar,\
+               lib/breeze.jar
 jre.compilation.profile = JavaSE-1.7
diff --git a/org.idempiere.zk.extra/copyjars.xml b/org.idempiere.zk.extra/copyjars.xml
index d784d6cfca..c71de00240 100644
--- a/org.idempiere.zk.extra/copyjars.xml
+++ b/org.idempiere.zk.extra/copyjars.xml
@@ -5,5 +5,6 @@
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/theme/breeze/8.5.0/breeze-8.5.0.jar" dest="lib/breeze.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target> 
 </project>