diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index 58030f1300..e78b5368b5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -51,4 +51,8 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	<javascript-module name="org.idempiere.commons" version="202011230530"/>
 	<javascript-module name="jquery.maskedinput" version="1.4.1" />
 	<javascript-module name="photobooth"	version="0.7-rsd3" />
+	
+	<!-- this js module doesn't actually exists and it is here for default theme version -->
+	<!-- since loading of  js module is on demand, it doesn't cause any error as long as you don't try to load it -->
+	<javascript-module name="idempiere.theme.default" version="202011282132" />
 </language>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
index 05e87ad3e1..e8a54fa529 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
@@ -22,7 +22,6 @@ import org.adempiere.webui.adwindow.ADWindow;
 import org.adempiere.webui.desktop.FavouriteController;
 import org.adempiere.webui.exception.ApplicationException;
 import org.adempiere.webui.session.SessionManager;
-import org.adempiere.webui.theme.ITheme;
 import org.adempiere.webui.theme.ThemeManager;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.model.MMenu;
@@ -175,7 +174,7 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
 		btnFavItem.setTooltiptext(description);
 		if (ThemeManager.isUseFontIconForImage())
 			btnFavItem.setIconSclass(imageSrc);
-		else if (imageSrc.startsWith(ITheme.THEME_PATH_PREFIX))
+		else if (imageSrc.startsWith(ThemeManager.THEME_PATH_PREFIX))
 			btnFavItem.setImage(imageSrc);
 		else			
 			btnFavItem.setImage(ThemeManager.getThemeResource(imageSrc));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
index b55d16faf1..9f49a34252 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
@@ -21,8 +21,9 @@ package org.adempiere.webui.theme;
 public interface ITheme {
 	//default theme
 	public static final String ZK_THEME_DEFAULT = "default";
-	//theme resource url prefix
-	public static final String THEME_PATH_PREFIX = "/theme/";
+	//theme resource url prefix. ~./ is the zk url prefix for resources loaded from classpath (typically at src/web folder)
+	public static final String THEME_PATH_PREFIX_V8 = "~./theme/";
+	public static final String THEME_PATH_PREFIX_V7 = "/theme/"; // for backward compatibility
 
 	//css for login window and box
 	public static final String LOGIN_WINDOW_CLASS = "login-window";
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
index 72b6c217bc..892516e144 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
@@ -32,18 +32,26 @@ import org.zkoss.image.AImage;
  */
 public final class ThemeManager {
 
+	//zk predefined starting path for classpath resources (src/web)
+	public static final String ZK_PREFIX_FOR_CLASSPATH_RESOURCE = "/web";
+	
+	//zk predefined url prefix for resources loaded from classpath 
+	public static final String ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE = "~./";
+
 	/**	Logger			*/
 	private static CLogger log = CLogger.getCLogger(ThemeManager.class);
 
-	private static String m_theme = null;
+	private static String m_theme = ITheme.ZK_THEME_DEFAULT;
 	private static String m_brokenTheme = null;
-
+	
+	public static String THEME_PATH_PREFIX = ITheme.THEME_PATH_PREFIX_V8;
+	
 	/**
 	 * @return url for large logo
 	 */
 	public static String getLargeLogo() {
 		String theme = getTheme();
-		String def = ITheme.THEME_PATH_PREFIX+theme+ITheme.LOGIN_LOGO_IMAGE;
+		String def = THEME_PATH_PREFIX+theme+ITheme.LOGIN_LOGO_IMAGE;
 		return MSysConfig.getValue(MSysConfig.ZK_LOGO_LARGE, def);
 	}
 
@@ -52,7 +60,7 @@ public final class ThemeManager {
 	 */
 	public static String getSmallLogo() {
 		String theme = getTheme();
-		String def = ITheme.THEME_PATH_PREFIX+theme+ITheme.HEADER_LOGO_IMAGE;
+		String def = THEME_PATH_PREFIX+theme+ITheme.HEADER_LOGO_IMAGE;
 		String url = MSysConfig.getValue(MSysConfig.ZK_LOGO_SMALL, null);
 		if (url == null)
 			url = MSysConfig.getValue(MSysConfig.WEBUI_LOGOURL, def);
@@ -72,11 +80,21 @@ public final class ThemeManager {
 			if (! theme.equals(m_theme)) {
 				if (! ITheme.ZK_THEME_DEFAULT.equals(theme)) {
 					// Verify the theme.css.dsp exists in the theme folder
-					if (ThemeManager.class.getResource(ITheme.THEME_PATH_PREFIX + theme + ITheme.THEME_STYLESHEET) == null) {
-						log.warning("The theme " + theme + " does not exist or is not properly configured, falling back to default");
-						m_brokenTheme = theme;
-						theme = ITheme.ZK_THEME_DEFAULT;
+					String themeCSSURL = THEME_PATH_PREFIX + theme + ITheme.THEME_STYLESHEET;
+					if (ThemeManager.class.getResource(toClassPathResourcePath(themeCSSURL)) == null) {
+						// verify if is a v7 theme
+						themeCSSURL = ITheme.THEME_PATH_PREFIX_V7 + theme + ITheme.THEME_STYLESHEET;
+						if (ThemeManager.class.getResource(toClassPathResourcePath(themeCSSURL)) != null) {
+							THEME_PATH_PREFIX = ITheme.THEME_PATH_PREFIX_V7;
+						} else {
+							log.warning("The theme " + theme + " does not exist or is not properly configured, falling back to default");
+							m_brokenTheme = theme;
+							THEME_PATH_PREFIX = ITheme.THEME_PATH_PREFIX_V8;
+							theme = ITheme.ZK_THEME_DEFAULT;
+						}
 					}
+				} else {
+					THEME_PATH_PREFIX = ITheme.THEME_PATH_PREFIX_V8;
 				}
 				m_theme = theme;
 			}
@@ -88,21 +106,21 @@ public final class ThemeManager {
 	 * @return url of theme stylesheet
 	 */
 	public static String getStyleSheet() {
-		return ITheme.THEME_PATH_PREFIX + getTheme() + ITheme.THEME_STYLESHEET;
+		return THEME_PATH_PREFIX + getTheme() + ITheme.THEME_STYLESHEET;
 	}
 
 	/**
 	 * @return url of theme stylesheet by browser
 	 */
 	public static String getStyleSheetByBrowser() {
-		return ITheme.THEME_PATH_PREFIX + getTheme() + ITheme.THEME_STYLESHEET_BY_BROWSER;
+		return THEME_PATH_PREFIX + getTheme() + ITheme.THEME_STYLESHEET_BY_BROWSER;
 	}
 
 	/**
 	 * @return url of theme preference page
 	 */
 	public static String getPreference() {
-		return ITheme.THEME_PATH_PREFIX + getTheme() + ITheme.THEME_PREFERENCE;
+		return THEME_PATH_PREFIX + getTheme() + ITheme.THEME_PREFERENCE;
 	}
 	
 	/**
@@ -117,7 +135,7 @@ public final class ThemeManager {
 	 */
 	public static String getBrowserIcon() {
 		String theme = getTheme();
-		String def = ITheme.THEME_PATH_PREFIX + theme + ITheme.BROWSER_ICON_IMAGE;
+		String def = THEME_PATH_PREFIX + theme + ITheme.BROWSER_ICON_IMAGE;
 		return MSysConfig.getValue(MSysConfig.ZK_BROWSER_ICON, def);
 	}
 	
@@ -127,7 +145,7 @@ public final class ThemeManager {
 	 * @return full resource url
 	 */
 	public static String getThemeResource(String name) {
-		StringBuilder builder = new StringBuilder(ITheme.THEME_PATH_PREFIX);
+		StringBuilder builder = new StringBuilder(THEME_PATH_PREFIX);
 		builder.append(getTheme());
 		builder.append("/").append(name);
 		String url = builder.toString().intern();
@@ -173,7 +191,7 @@ public final class ThemeManager {
 	}
 
 	private static final CCache<String, Boolean> s_themeHasCustomCSSCache = new CCache<String, Boolean>(null, "ThemeHasCustomCSSCache", 2, -1, false);
-	
+
 	/**
 	 * @return true if custom css exists
 	 */
@@ -182,7 +200,8 @@ public final class ThemeManager {
 		Boolean flag = s_themeHasCustomCSSCache.get(theme);
 		if (flag != null)
 			return flag;
-		if (ThemeManager.class.getResource(ITheme.THEME_PATH_PREFIX +  theme + "/css/fragment/custom.css.dsp") == null) {
+		String customCSSURL = THEME_PATH_PREFIX + theme + "/css/fragment/custom.css.dsp";
+		if (ThemeManager.class.getResource(toClassPathResourcePath(customCSSURL)) == null) {
 			flag = Boolean.FALSE;
 		} else {
 			flag = Boolean.TRUE;
@@ -197,5 +216,19 @@ public final class ThemeManager {
 	
 	public static boolean isUseFontIconForImage() {
 		return "Y".equals(Env.getContext(Env.getCtx(), ITheme.USE_FONT_ICON_FOR_IMAGE));
-	}	
+	}
+	
+	/**
+	 * @param zkResourceURL zk resource url for classpath resources (url start with ~./)
+	 * @return Resource path for lookup/loading through class loader (absolute path start with /web)
+	 */
+	public static String toClassPathResourcePath(String zkResourceURL) {
+		if (zkResourceURL == null)
+			return zkResourceURL;
+		
+		if (!zkResourceURL.startsWith(ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE))
+			return zkResourceURL;
+		
+		return ZK_PREFIX_FOR_CLASSPATH_RESOURCE+zkResourceURL.substring(2);
+	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
index 46ffbf2979..7cdfdf5708 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
@@ -74,13 +74,21 @@ public class WebUIResourceFinder implements IResourceFinder {
 			}
 		} else if (url == null && name.startsWith("images/")) {
 			String t = ThemeManager.getThemeResource(name);
-			e = find(t);
-			url = e != null && e.hasMoreElements() ? e.nextElement() : null;
-			if (url == null && t.endsWith(".gif")) {
-				t = t.replace(".gif", ".png");
+			if (t.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE)) {
+				url = ThemeManager.class.getResource(ThemeManager.toClassPathResourcePath(t));
+			} else {
 				e = find(t);
 				url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 			}
+			if (url == null && t.endsWith(".gif")) {
+				t = t.replace(".gif", ".png");
+				if (t.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE)) {
+					url = ThemeManager.class.getResource(ThemeManager.toClassPathResourcePath(t));
+				} else {
+					e = find(t);
+					url = e != null && e.hasMoreElements() ? e.nextElement() : null;
+				}
+			}
 		} else if (url == null && name.endsWith(".gif")) {
 			String t = name.replace(".gif", ".png");
 			e = find(t);
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/about.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/about.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/about.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/about.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/adwindow.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/adwindow.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/application-menu.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/application-menu.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/borderlayout.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/borderlayout.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/borderlayout.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/borderlayout.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/button.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/button.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/button.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/button.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/desktop.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/desktop.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/field-editor.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/field-editor.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/find-window.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/find-window.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/font-icons.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/font-icons.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/form.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/form.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/form.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/form.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/grid.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/grid.css.dsp
similarity index 93%
rename from org.adempiere.ui.zk/theme/default/css/fragment/grid.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/grid.css.dsp
index cc84660a24..705a39623a 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/grid.css.dsp
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/grid.css.dsp
@@ -7,7 +7,7 @@
 
 .z-grid tbody tr.grid-inactive-row td.row-indicator-selected {
 	background-color: #DCDAD4 !important;
-	background-image: url(${c:encodeURL('/theme/default/images/EditRecord16.png')}) !important;
+	background-image: url(${c:encodeURL('~./theme/default/images/EditRecord16.png')}) !important;
 	background-position: center;
 	background-repeat: no-repeat;
 	background-size: 16px 16px;  
@@ -27,7 +27,7 @@
 
 .z-grid tbody tr.highlight td.row-indicator-selected {
 	background-color: #FFFFCC !important;
-	background-image: url(${c:encodeURL('/theme/default/images/EditRecord16.png')}) !important;
+	background-image: url(${c:encodeURL('~./theme/default/images/EditRecord16.png')}) !important;
 	background-position: center;
 	background-repeat: no-repeat;
 	background-size: 16px 16px;  
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/group.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/group.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/group.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/group.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/help-window.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/help-window.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/help-window.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/help-window.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/info-window.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/info-window.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/info-window.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/info-window.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/input-element.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/input-element.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/login.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/login.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/login.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/login.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/menu-tree.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/menu-tree.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/parameter-process.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/parameter-process.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/setup-wizard.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/setup-wizard.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/setup-wizard.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/setup-wizard.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/tab-editor.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tab-editor.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/tab-editor.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tab-editor.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/tab.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tab.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/tab.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tab.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/toolbar-popup.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/toolbar-popup.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/toolbar-popup.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/toolbar-popup.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/toolbar.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/toolbar.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/toolbar.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tree.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/tree.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/window-size.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/window-size.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/window.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/window.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/fragment/window.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/window.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/theme.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/theme.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/theme.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/themeie.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/themeie.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/themeie.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/themeie.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/thememoz.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/thememoz.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/thememoz.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/thememoz.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/css/themesaf.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/themesaf.css.dsp
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/css/themesaf.css.dsp
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/themesaf.css.dsp
diff --git a/org.adempiere.ui.zk/theme/default/images/Account10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Account10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Account16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Account16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Account24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Account24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Account24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Archive16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Archive16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Archive16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Archive16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Archive24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Archive24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Archive24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Archive24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Assignment10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Assignment10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Assignment16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Assignment16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Assignment24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Assignment24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Assignment24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Attachment16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Attachment16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Attachment16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Attachment16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Attachment24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Attachment24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Attachment24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Attachment24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/BPartner10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/BPartner10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/BPartner16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/BPartner16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/BPartner24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/BPartner24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/BPartner24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/CSVImport16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/CSVImport16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/CSVImport16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/CSVImport16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/CSVImport24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/CSVImport24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/CSVImport24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/CSVImport24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calculator10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calculator10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calculator16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calculator16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calculator24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calculator24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calculator24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calendar10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calendar10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calendar16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calendar16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Calendar24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Calendar24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Calendar24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Cancel10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Cancel10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Cancel16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Cancel16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Cancel24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Cancel24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Cancel24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ChangeLog16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ChangeLog16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ChangeLog16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ChangeLog16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Chat16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Chat16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Chat16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Chat16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Chat24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Chat24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Chat24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Chat24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Copy16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Copy16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Copy16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Copy16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Copy24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Copy24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Copy24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Copy24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Customize16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Customize16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Customize16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Customize16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Customize24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Customize24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Customize24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Customize24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/DefaultMailText.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DefaultMailText.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/DefaultMailText.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DefaultMailText.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Delete16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Delete16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Delete16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Delete16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Delete24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Delete24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Delete24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Delete24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/DeleteSelection16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DeleteSelection16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/DeleteSelection16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DeleteSelection16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/DeleteSelection24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DeleteSelection24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/DeleteSelection24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/DeleteSelection24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Detail16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Detail16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Detail16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Detail16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Detail24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Detail24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Detail24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Detail24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/EMailSupport16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EMailSupport16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/EMailSupport16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EMailSupport16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/EMailSupport24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EMailSupport24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/EMailSupport24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EMailSupport24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/EditRecord16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EditRecord16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/EditRecord16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/EditRecord16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Editor16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Editor16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Editor16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Editor16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Editor24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Editor24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Editor24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Editor24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Error32.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Error32.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Error32.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Error32.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ErrorIndicator16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ErrorIndicator16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ErrorIndicator16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ErrorIndicator16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ErrorIndicator24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ErrorIndicator24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ErrorIndicator24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ErrorIndicator24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Export16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Export16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Export16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Export16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Export24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Export24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Export24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Export24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/FastBack24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FastBack24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/FastBack24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FastBack24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/FastForward24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FastForward24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/FastForward24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FastForward24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/FileImport16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FileImport16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/FileImport16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FileImport16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/FileImport24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FileImport24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/FileImport24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/FileImport24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Find16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Find16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Find16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Find16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Find24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Find24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Find24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Find24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/First16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/First16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/First16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/First16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/First24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/First24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/First24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/First24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Folder16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Folder16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Folder16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Folder16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Folder24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Folder24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Folder24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Folder24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/GetMail16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/GetMail16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/GetMail16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/GetMail16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/GetMail24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/GetMail24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/GetMail24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/GetMail24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Help16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Help16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Help16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Help16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Help24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Help24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Help24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Help24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/History16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/History16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/History16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/History16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/History24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/History24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/History24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/History24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Home16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Home16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Home16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Home16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Home24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Home24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Home24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Home24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Ignore16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ignore16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Ignore16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ignore16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Ignore24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ignore24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Ignore24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ignore24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Import16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Import16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Import16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Import16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Import24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Import24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Import24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Import24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Info16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Info16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Info16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Info16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Info24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Info24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Info24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Info24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoAccount16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoAccount16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoAccount16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoAccount16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoAccount24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoAccount24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoAccount24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoAccount24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoBPartner16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoBPartner16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoBPartner16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoBPartner16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoBPartner24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoBPartner24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoBPartner24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoBPartner24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoIndicator16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoIndicator16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoIndicator16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoIndicator16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoIndicator24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoIndicator24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoIndicator24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoIndicator24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoProduct16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoProduct16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoProduct16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoProduct16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoProduct24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoProduct24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoProduct24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoProduct24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoSchedule16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoSchedule16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoSchedule16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoSchedule16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/InfoSchedule24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoSchedule24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/InfoSchedule24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/InfoSchedule24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Last16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Last16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Last16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Last16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Last24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Last24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Last24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Last24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Location10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Location10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Location10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Location10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Location16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Location16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Location16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Location16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Locator10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Locator10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Locator10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Locator10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Locator16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Locator16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Locator16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Locator16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Lock16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Lock16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Lock16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Lock16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Lock24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Lock24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Lock24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Lock24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/LockX16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/LockX16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/LockX16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/LockX16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/LockX24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/LockX24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/LockX24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/LockX24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Logout24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Logout24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Logout24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Logout24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/MoveDown16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveDown16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/MoveDown16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveDown16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/MoveLeft16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveLeft16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/MoveLeft16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveLeft16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/MoveRight16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveRight16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/MoveRight16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveRight16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/MoveUp16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveUp16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/MoveUp16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/MoveUp16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Multi16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Multi16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Multi16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Multi16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Multi24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Multi24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Multi24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Multi24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/New10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/New10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/New16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/New16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/New24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/New24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/New24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Next16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Next16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Next16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Next16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Next24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Next24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Next24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Next24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Ok16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ok16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Ok16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ok16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Ok24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ok24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Ok24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Ok24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Online10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Online10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Online16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Online16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Online24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Online24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Online24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Open16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Open16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Open16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Open16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Open24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Open24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Open24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Open24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PAttribute10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PAttribute10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PAttribute16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PAttribute16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PAttribute24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PAttribute24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PAttribute24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PageSetup16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PageSetup16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PageSetup16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PageSetup16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PageSetup24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PageSetup24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PageSetup24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PageSetup24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Parent16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Parent16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Parent16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Parent16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Parent24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Parent24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Parent24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Parent24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Payment10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Payment10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Payment16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Payment16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Payment24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Payment24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Payment24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PickOpen10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PickOpen10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PickOpen10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PickOpen10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PickOpen16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PickOpen16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PickOpen16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PickOpen16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PostIt16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PostIt16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PostIt16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PostIt16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/PostIt24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PostIt24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/PostIt24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/PostIt24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Preference16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Preference16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Preference16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Preference16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Preference24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Preference24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Preference24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Preference24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Previous16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Previous16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Previous16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Previous16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Previous24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Previous24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Previous24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Previous24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Print16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Print16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Print16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Print16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Print24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Print24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Print24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Print24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Process16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Process16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Process16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Process16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Process24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Process24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Process24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Process24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ProcessMenu16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ProcessMenu16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ProcessMenu16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ProcessMenu16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ProcessMenu24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ProcessMenu24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ProcessMenu24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ProcessMenu24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Product10.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product10.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Product10.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product10.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Product16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Product16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Product24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Product24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Product24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/QuickForm16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/QuickForm16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/QuickForm16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/QuickForm16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/QuickForm24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/QuickForm24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/QuickForm24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/QuickForm24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Redo16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Redo16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Redo16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Redo16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Redo24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Redo24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Redo24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Redo24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Refresh16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Refresh16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Refresh16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Refresh16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Refresh24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Refresh24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Refresh24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Refresh24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Register16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Register16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Register16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Register16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Register24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Register24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Register24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Register24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Report16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Report16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Report16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Report16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Report24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Report24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Report24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Report24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Request16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Request16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Request16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Request16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Request24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Request24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Request24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Request24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Reset16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Reset16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Reset16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Reset16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Reset24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Reset24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Reset24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Reset24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Save16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Save16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Save16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Save16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Save24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Save24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Save24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Save24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SaveAsZip24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveAsZip24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SaveAsZip24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveAsZip24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SaveCreate16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveCreate16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SaveCreate16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveCreate16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SaveCreate24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveCreate24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SaveCreate24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SaveCreate24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Script16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Script16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Script16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Script16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Script24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Script24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Script24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Script24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SelectAll16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SelectAll16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SelectAll16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SelectAll16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SelectAll24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SelectAll24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SelectAll24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SelectAll24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SendMail16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SendMail16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SendMail16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SendMail16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/SendMail24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SendMail24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/SendMail24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/SendMail24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Server16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Server16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Server16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Server16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Server24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Server24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Server24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Server24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Setup16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Setup16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Setup16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Setup16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Setup24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Setup24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Setup24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Setup24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ShowMore16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ShowMore16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ShowMore16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ShowMore16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ShowMore24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ShowMore24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ShowMore24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ShowMore24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/StepBack24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/StepBack24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/StepBack24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/StepBack24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/StepForward24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/StepForward24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/StepForward24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/StepForward24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Summary16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Summary16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Summary16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Summary16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Summary24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Summary24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Summary24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Summary24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Translate16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Translate16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Translate16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Translate16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Translate24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Translate24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Translate24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Translate24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/UnSort16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/UnSort16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/UnSort16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/UnSort16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/UnSort24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/UnSort24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/UnSort24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/UnSort24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Undo16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Undo16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Undo16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Undo16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Undo24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Undo24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Undo24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Undo24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/VPreference16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/VPreference16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/VPreference16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/VPreference16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/VPreference24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/VPreference24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/VPreference24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/VPreference24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Wizard24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Wizard24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Wizard24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Wizard24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/WorkFlow16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/WorkFlow16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/WorkFlow16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/WorkFlow16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/WorkFlow24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/WorkFlow24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/WorkFlow24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/WorkFlow24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/X8.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/X8.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/X8.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/X8.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Zoom16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Zoom16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Zoom16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Zoom16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/Zoom24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Zoom24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/Zoom24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/Zoom24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ZoomAcross16.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ZoomAcross16.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ZoomAcross16.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ZoomAcross16.png
diff --git a/org.adempiere.ui.zk/theme/default/images/ZoomAcross24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ZoomAcross24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/ZoomAcross24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/ZoomAcross24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/collapse-header.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/collapse-header.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/collapse-header.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/collapse-header.png
diff --git a/org.adempiere.ui.zk/theme/default/images/downarrow.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/downarrow.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/downarrow.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/downarrow.png
diff --git a/org.adempiere.ui.zk/theme/default/images/expand-header.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/expand-header.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/expand-header.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/expand-header.png
diff --git a/org.adempiere.ui.zk/theme/default/images/group_bg.gif b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/group_bg.gif
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/group_bg.gif
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/group_bg.gif
diff --git a/org.adempiere.ui.zk/theme/default/images/header-bg.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/header-bg.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/header-bg.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/header-bg.png
diff --git a/org.adempiere.ui.zk/theme/default/images/header-logo.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/header-logo.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/header-logo.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/header-logo.png
diff --git a/org.adempiere.ui.zk/theme/default/images/icon.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/icon.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/icon.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/icon.png
diff --git a/org.adempiere.ui.zk/theme/default/images/login-box-bg.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-bg.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/login-box-bg.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-bg.png
diff --git a/org.adempiere.ui.zk/theme/default/images/login-box-footer.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-footer.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/login-box-footer.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-footer.png
diff --git a/org.adempiere.ui.zk/theme/default/images/login-box-header.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-header.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/login-box-header.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-box-header.png
diff --git a/org.adempiere.ui.zk/theme/default/images/login-logo.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-logo.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/login-logo.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/login-logo.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mClosed.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mClosed.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mClosed.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mClosed.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mDocAction.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mDocAction.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mDocAction.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mDocAction.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mForm.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mForm.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mForm.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mForm.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mInfo.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mInfo.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mInfo.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mInfo.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mOpen.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mOpen.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mOpen.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mOpen.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mProcess.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mProcess.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mProcess.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mProcess.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mReport.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mReport.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mReport.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mReport.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mSetVariable.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mSetVariable.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mSetVariable.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mSetVariable.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mUserChoice.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mUserChoice.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mUserChoice.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mUserChoice.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mWindow.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWindow.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mWindow.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWindow.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mWorkFlow.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWorkFlow.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mWorkFlow.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWorkFlow.png
diff --git a/org.adempiere.ui.zk/theme/default/images/mWorkbench.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWorkbench.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/mWorkbench.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/mWorkbench.png
diff --git a/org.adempiere.ui.zk/theme/default/images/progress3.gif b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/progress3.gif
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/progress3.gif
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/progress3.gif
diff --git a/org.adempiere.ui.zk/theme/default/images/threelines.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/threelines.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/threelines.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/threelines.png
diff --git a/org.adempiere.ui.zk/theme/default/images/uparrow.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/uparrow.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/uparrow.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/uparrow.png
diff --git a/org.adempiere.ui.zk/theme/default/images/wfBack24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfBack24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/wfBack24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfBack24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/wfEnd24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfEnd24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/wfEnd24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfEnd24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/wfNext24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfNext24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/wfNext24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfNext24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/wfStart24.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfStart24.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/wfStart24.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/wfStart24.png
diff --git a/org.adempiere.ui.zk/theme/default/images/zkpowered_s.png b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/zkpowered_s.png
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/images/zkpowered_s.png
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/images/zkpowered_s.png
diff --git a/org.adempiere.ui.zk/theme/default/preference.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/preference.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/preference.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/preference.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/calendar/calendar.css b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/calendar/calendar.css
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css
diff --git a/org.adempiere.ui.zk/theme/default/zul/calendar/calendar.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.zul
similarity index 92%
rename from org.adempiere.ui.zk/theme/default/zul/calendar/calendar.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.zul
index 73a7ca96fc..5e2c444a49 100644
--- a/org.adempiere.ui.zk/theme/default/zul/calendar/calendar.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.zul
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?component name="divtab" macro-uri="/theme/default/zul/calendar/divtab.zul"?>
-<?component name="divarrow" macro-uri="/theme/default/zul/calendar/divarrow.zul"?>
+<?component name="divtab" macro-uri="~./theme/default/zul/calendar/divtab.zul"?>
+<?component name="divarrow" macro-uri="~./theme/default/zul/calendar/divarrow.zul"?>
 <zk>
 <zscript><![CDATA[
 	import org.compiere.util.Msg;
@@ -26,7 +26,7 @@
 	var calendarClass = isFontIcon ? "z-cal-font-theme" : "";
 
 ]]></zscript>
-<style src="/theme/default/zul/calendar/calendar.css"/>
+<style src="~./theme/default/zul/calendar/calendar.css"/>
 <borderlayout id="main">
 <center border="none">
 <calendars class="${calendarClass}" firstDayOfWeek="Monday" mold="month" id="cal" xmlns:w="client" w:onBind="try{_overrideMsgCal(); var me=this; setTimeout(function(){me.onSize();},50); }catch(error){} ">
diff --git a/org.adempiere.ui.zk/theme/default/zul/calendar/calendar_mini.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar_mini.zul
similarity index 89%
rename from org.adempiere.ui.zk/theme/default/zul/calendar/calendar_mini.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar_mini.zul
index 641d3bcacf..4f94464398 100644
--- a/org.adempiere.ui.zk/theme/default/zul/calendar/calendar_mini.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar_mini.zul
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?component name="divarrow" macro-uri="/theme/default/zul/calendar/divarrow.zul"?>
+<?component name="divarrow" macro-uri="~./theme/default/zul/calendar/divarrow.zul"?>
 <zk>
 <zscript><![CDATA[
 	var calendarIcon = org.adempiere.webui.theme.ThemeManager.getThemeResource("images/Calendar16.png");
@@ -19,7 +19,7 @@
 	calendarIcon = isFontIcon ? "" : calendarIcon;
 	
 ]]></zscript>
-<style src="/theme/default/zul/calendar/calendar.css"/>
+<style src="~./theme/default/zul/calendar/calendar.css"/>
 <calendars sclass="${calendarClass}" firstDayOfWeek="Monday" mold="month" id="cal" xmlns:w="client" w:onBind="try{_overrideMsgCal(); var me=this; setTimeout(function(){me.onSize();},50); }catch(error){} ">
 	<toolbar sclass="calendar-toolbar">
 		<div class="float-left">
diff --git a/org.adempiere.ui.zk/theme/default/zul/calendar/divarrow.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/divarrow.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/calendar/divarrow.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/divarrow.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/calendar/divtab.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/divtab.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/calendar/divtab.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/divtab.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/activities.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/activities.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/activities.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/activities.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/calendar.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/calendar.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/calendar.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/calendar.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/favourites.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/favourites.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/favourites.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/favourites.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/performance.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/performance.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/performance.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/performance.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/recentItems.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/recentItems.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/recentItems.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/recentItems.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/runningJobs.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/runningJobs.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/runningJobs.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/runningJobs.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/dashboard/views.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/views.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/dashboard/views.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/dashboard/views.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/desktop/desktop.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/desktop/desktop.zul
similarity index 85%
rename from org.adempiere.ui.zk/theme/default/zul/desktop/desktop.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/desktop/desktop.zul
index e5c55a363d..05864022dc 100644
--- a/org.adempiere.ui.zk/theme/default/zul/desktop/desktop.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/desktop/desktop.zul
@@ -3,7 +3,7 @@
   <div height="100%">
 	<borderlayout id="layout" sclass="desktop-layout">
 		<north sclass="desktop-north">
-			<include src="/theme/default/zul/desktop/header.zul" id="northBody"/>
+			<include src="~./theme/default/zul/desktop/header.zul" id="northBody"/>
 		</north>
 		<west id="desktop-left-column" sclass="desktop-left-column" collapsible="true" splittable="true"
 			hflex="1">
diff --git a/org.adempiere.ui.zk/theme/default/zul/desktop/header.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/desktop/header.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/desktop/header.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/desktop/header.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-bottom.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-bottom.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-bottom.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-bottom.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-info.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-info.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-info.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-info.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-left.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-left.zul
similarity index 53%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-left.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-left.zul
index c9561e171b..36dd79501c 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/login-left.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-left.zul
@@ -3,10 +3,10 @@
 Copyright (C) 2009 Low Heng Sin
 Copyright (C) 2009 Idalica Corporation
 -->
-<?component name="vendorLogo" inline="true" macroURI="vendor-logo.zul"?>
-<?component name="loginInfo" macroURI="login-info.zul"?>
-<?component name="versionInfo" inline="true" macroURI="version-info.zul"?>
-<?component name="loginLinks" inline="true" macroURI="login-links.zul"?>
+<?component name="vendorLogo" inline="true" macroURI="~./theme/default/zul/login/vendor-logo.zul"?>
+<?component name="loginInfo" macroURI="~./theme/default/zul/login/login-info.zul"?>
+<?component name="versionInfo" inline="true" macroURI="~./theme/default/zul/login/version-info.zul"?>
+<?component name="loginLinks" inline="true" macroURI="~./theme/default/zul/login/login-links.zul"?>
 <div>
 	<vendorLogo/>
 	<loginInfo if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo&quot;) or desktop.execution.serverName.startsWith(&quot;test&quot;) or desktop.execution.serverName.startsWith(&quot;triage&quot;)}"/>
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-links.zul
similarity index 87%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-links.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-links.zul
index 335f9f48be..bd83112df4 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-links.zul
@@ -18,7 +18,7 @@ Copyright (C) 2009 Idalica Corporation
 <div class="loginLinksBox" if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo&quot;) or desktop.execution.serverName.startsWith(&quot;test&quot;) or desktop.execution.serverName.startsWith(&quot;triage&quot;)}"
 	style="position: absolute; bottom: 30px;">
 
-	<toolbarbutton href="http://www.zkoss.org" image="/theme/default/images/zkpowered_s.png"
+	<toolbarbutton href="http://www.zkoss.org" image="~./theme/default/images/zkpowered_s.png"
 		tooltiptext="Powered by Zk" target="_blank"
 		/>
 </div>
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-right.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-right.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-right.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-right.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-top.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-top.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/login/login-top.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login-top.zul
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login.zul
similarity index 69%
rename from org.adempiere.ui.zk/theme/default/zul/login/login.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login.zul
index f1ada11392..0a6ba3a932 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/login.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/login.zul
@@ -7,16 +7,16 @@
 		</vbox>
 	</center>
 	<east sclass="login-east-panel">
-		<include src="/theme/default/zul/login/login-right.zul"/>
+		<include src="~./theme/default/zul/login/login-right.zul"/>
 	</east>
 	<west sclass="login-west-panel">
-		<include src="/theme/default/zul/login/login-left.zul"/>
+		<include src="~./theme/default/zul/login/login-left.zul"/>
 	</west>
 	<north sclass="login-north-panel">
-		<include src="/theme/default/zul/login/login-top.zul"/>
+		<include src="~./theme/default/zul/login/login-top.zul"/>
 	</north>
 	<south sclass="login-south-panel">
-		<include src="/theme/default/zul/login/login-bottom.zul"/>
+		<include src="~./theme/default/zul/login/login-bottom.zul"/>
 	</south>
 </borderlayout>
 </zk>
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
similarity index 95%
rename from org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
index 0dc33ea9ca..07d1c97b4b 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/vendor-logo.zul
@@ -8,7 +8,7 @@ Copyright (C) 2009 Idalica Corporation
 <div style="background-color: #E5E5E5; margin: 5px;"
 	if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo&quot;) or desktop.execution.serverName.startsWith(&quot;test&quot;) or desktop.execution.serverName.startsWith(&quot;triage&quot;)}">
 	<hbox align="center">
-		<a href="http://www.idempiere.org" target="_blank"><image src="/theme/default/images/login-logo.png"/></a>
+		<a href="http://www.idempiere.org" target="_blank"><image src="~./theme/default/images/login-logo.png"/></a>
 		<label value="iDempiere Online Demonstration"
 			style="font-family:Arial,sans-serif; color:#578BB8; font-size:1.5em; font-weight: bold;" />
 	</hbox>
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/version-info.zul b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/version-info.zul
similarity index 100%
rename from org.adempiere.ui.zk/theme/default/zul/login/version-info.zul
rename to org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/login/version-info.zul
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index 0f79b36f56..8e3ecdc712 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -5,16 +5,10 @@ bin.includes = META-INF/,\
                images/,\
                index.zul,\
                js/,\
-               theme/,\
                theme.zs,\
                zul/,\
                timeout.zul,\
                plugin.xml,\
-               theme/default/zul/calendar/calendar.css,\
-               theme/default/zul/calendar/calendar.zul,\
-               theme/default/zul/calendar/calendar_mini.zul,\
-               theme/default/zul/calendar/divarrow.zul,\
-               theme/default/zul/calendar/divtab.zul,\
                OSGI-INF/,\
                OSGI-INF/reportviewerprovider.xml,\
                OSGI-INF/defaultinfofactory.xml,\
@@ -45,13 +39,13 @@ src.includes = WEB-INF/tld/,\
                images/,\
                index.zul,\
                js/,\
-               theme/,\
+               WEB-INF/src/web/theme/,\
                theme.zs,\
                zul/,\
-               theme/default/zul/calendar/calendar.css,\
-               theme/default/zul/calendar/calendar.zul,\
-               theme/default/zul/calendar/calendar_mini.zul,\
-               theme/default/zul/calendar/divarrow.zul,\
-               theme/default/zul/calendar/divtab.zul
+               WEB-INF/src/web/theme/default/zul/calendar/calendar.css,\
+               WEB-INF/src/web/theme/default/zul/calendar/calendar.zul,\
+               WEB-INF/src/web/theme/default/zul/calendar/calendar_mini.zul,\
+               WEB-INF/src/web/theme/default/zul/calendar/divarrow.zul,\
+               WEB-INF/src/web/theme/default/zul/calendar/divtab.zul
 bin.excludes = WEB-INF/src/
 source.. = WEB-INF/src/