diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java b/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
index 23e58f55e1..85ae15a56b 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
@@ -56,4 +56,7 @@ public interface ITheme {
 	public static final String LOGIN_LOGO_IMAGE = "/images/login-logo.png";
 	public static final String HEADER_LOGO_IMAGE = "/images/header-logo.png";
 	public static final String BROWSER_ICON_IMAGE= "/images/icon.png";
+
+	//stylesheet url
+	public static final String THEME_STYLESHEET = "/css/theme.css.dsp";
 }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
index 507aa1ea26..91225237fd 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
@@ -51,6 +51,13 @@ public final class ThemeManager {
 		return MSysConfig.getValue(ITheme.ZK_THEME, ITheme.ZK_THEME_DEFAULT);
 	}
 
+	/**
+	 * @return url of theme stylesheet
+	 */
+	public static String getStyleSheet() {
+		return ITheme.THEME_PATH_PREFIX + getTheme() + ITheme.THEME_STYLESHEET;
+	}
+
 	/**
 	 * @return title text for the browser window
 	 */
diff --git a/zkwebui/index.zul b/zkwebui/index.zul
index ab63a17354..3b02fb2a47 100644
--- a/zkwebui/index.zul
+++ b/zkwebui/index.zul
@@ -5,7 +5,7 @@ Copyright (C) 2007 Ashley G Ramdass.
 <?page style="height:100%"?>
 <?init zscript="theme.zs" ?>
 <?link rel="icon" type="image/png" href="${browserIcon}"?>
-<?link rel="stylesheet" type="text/css" href="/theme/${theme}/css/theme.css.dsp"?>
+<?link rel="stylesheet" type="text/css" href="${themeStyleSheet}"?>
 <zk>
 	<window use="org.adempiere.webui.AdempiereWebUI"/>
 </zk>
\ No newline at end of file
diff --git a/zkwebui/theme.zs b/zkwebui/theme.zs
index e87effe03c..5ed7986b82 100644
--- a/zkwebui/theme.zs
+++ b/zkwebui/theme.zs
@@ -1,4 +1,3 @@
-import org.compiere.model.MSysConfig;
 import org.adempiere.webui.theme.ThemeManager;
-var theme = MSysConfig.getValue("ZK_THEME", "default");
+var themeStyleSheet = ThemeManager.getStyleSheet();
 var browserIcon = ThemeManager.getBrowserIcon();