diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 6a451f917..4e21972fc 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -180,7 +180,7 @@ class FormHelper extends Helper {
 		if (strpos($path, '://')) {
 			$url = $path;
 		} else {
-			$url = $this->webroot . IMAGES_URL . $this->themeWeb . $path;
+			$url = $this->webroot . $this->themeWeb . IMAGES_URL . $path;
 		}
 		return sprintf($this->tags['submitimage'], $url, $this->_parseAttributes($htmlAttributes, null, '', ' '));
 	}
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index eb5b75d19..9091c9711 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -331,7 +331,7 @@ class HtmlHelper extends Helper {
  * @return mixed Either string or boolean value, depends on AUTO_OUTPUT and $return.
  */
 	function css($path, $rel = 'stylesheet', $htmlAttributes = null, $return = false) {
-		$url = "{$this->webroot}" . (COMPRESS_CSS ? 'c' : '') . CSS_URL . $this->themeWeb . $path . ".css";
+		$url = "{$this->webroot}" . (COMPRESS_CSS ? 'c' : '') . $this->themeWeb  . CSS_URL . $path . ".css";
 		if ($rel == 'import') {
 			return $this->output(sprintf($this->tags['style'], $this->parseHtmlOptions($htmlAttributes, null, '', ' '), '@import url(' . $url . ');'), $return);
 		} else {
@@ -409,7 +409,7 @@ class HtmlHelper extends Helper {
 		if (strpos($path, '://')) {
 			$url = $path;
 		} else {
-			$url = $this->webroot . IMAGES_URL . $this->themeWeb . $path;
+			$url = $this->webroot . $this->themeWeb . IMAGES_URL . $path;
 		}
 
 		if (!isset($htmlAttributes['alt'])) {
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 779a697c2..0434962d6 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -63,7 +63,7 @@ class JavascriptHelper extends Helper{
 					$script .= "\n" . '//--><!]]>' . "\n";
 				}
 			}
-			
+
 			if ($block) {
 				return sprintf($this->tags['javascriptblock'], $script);
 			} else {
@@ -82,7 +82,7 @@ class JavascriptHelper extends Helper{
 			$url .= '.js';
 		}
 		if (strpos($url, '://') === false) {
-			$url = $this->webroot . JS_URL . $this->themeWeb . $url;
+			$url = $this->webroot . $this->themeWeb . JS_URL . $url;
 		}
 		return sprintf($this->tags['javascriptlink'], $url);
 	}
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 98e62d0e7..bca8afb76 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id:$ */
+/* SVN FILE: $Id$ */
 /**
  * A custom view class that is used for themeing
  *
@@ -60,10 +60,10 @@ class ThemeView extends View {
 	function __construct (&$controller) {
 		parent::__construct($controller);
     	$this->theme =& $controller->theme;
-    	$this->themeWeb = $this->theme.'/';
-    	$this->themeElement = VIEWS.$this->theme.DS.'elements'.DS;
-    	$this->themeLayout =  VIEWS.$this->theme.DS.'layouts'.DS;
-    	$this->themePath = VIEWS.$this->theme.DS;
+    	$this->themeWeb = 'themed/'.$this->theme.'/';
+    	$this->themeElement = VIEWS.'themed'.DS.$this->theme.DS.'elements'.DS;
+    	$this->themeLayout =  VIEWS.'themed'.DS.$this->theme.DS.'layouts'.DS;
+    	$this->themePath = VIEWS.'themed'.DS.$this->theme.DS;
 	}
 
 /**