diff --git a/spring-js/dojo-build/dojo-build.zip b/spring-js/dojo-build/dojo-build.zip
index ad72c9a5..d79afbf3 100644
Binary files a/spring-js/dojo-build/dojo-build.zip and b/spring-js/dojo-build/dojo-build.zip differ
diff --git a/spring-js/scripts/dojo/build.properties b/spring-js/scripts/dojo/build.properties
index fe15d9bf..2d77d6f5 100644
--- a/spring-js/scripts/dojo/build.properties
+++ b/spring-js/scripts/dojo/build.properties
@@ -1,4 +1,4 @@
 
-dojo.version=1.2.4
+dojo.version=1.5.0
 dojo.download.url=http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}-src.zip
 dojo.profile=standard.profile.js
diff --git a/spring-js/scripts/dojo/standard.profile.js b/spring-js/scripts/dojo/standard.profile.js
index 4750eeb7..3c2f4d8a 100644
--- a/spring-js/scripts/dojo/standard.profile.js
+++ b/spring-js/scripts/dojo/standard.profile.js
@@ -15,7 +15,8 @@ dependencies ={
 		    ]
         },
         
-        // Now add layers from Dojo's standard.profile.js
+        // Now add layers from Dojo's standard.profile.js:
+        // http://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js
 
 		{
 			name: "../dijit/dijit.js",
@@ -31,9 +32,46 @@ dependencies ={
 			dependencies: [
 				"dijit.dijit-all"
 			]
-		}
+		},
+		{
+			name: "../dojox/grid/DataGrid.js",
+			dependencies: [
+				"dojox.grid.DataGrid"
+			]
+		},
+		{
+			name: "../dojox/gfx.js",
+			dependencies: [
+				"dojox.gfx"
+			]
+		},
+		// FIXME: 
+		//		we probably need a better structure for this layer and need to
+		//		add some of the most common themes
+		{
+			name: "../dojox/charting/widget/Chart2D.js",
+			dependencies: [
+				"dojox.charting.widget.Chart2D",
+				"dojox.charting.widget.Sparkline",
+				"dojox.charting.widget.Legend"
+			]
+		},
+		{
+			name: "../dojox/dtl.js",
+			dependencies: [
+				"dojox.dtl",
+				"dojox.dtl.Context",
+				"dojox.dtl.tag.logic",
+				"dojox.dtl.tag.loop",
+				"dojox.dtl.tag.date",
+				"dojox.dtl.tag.loader",
+				"dojox.dtl.tag.misc",
+				"dojox.dtl.ext-dojo.NodeList"
+			]
+		}		
     ],
     prefixes: [
-        [ "dijit", "../dijit" ]
+        [ "dijit", "../dijit" ],
+		[ "dojox", "../dojox" ]
     ]
 };
diff --git a/spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js b/spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js
index 13a4184f..baabfb34 100644
--- a/spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js
+++ b/spring-js/src/main/resources/META-INF/spring/Spring-Dojo.js
@@ -312,7 +312,7 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
 			document.body.appendChild(tempSpan);
 			tempSpan.innerHTML=response;
 			var tempContainer = new dojo.NodeList(tempSpan);
-			var newNodes = tempContainer.query("#ajaxResponse > *").orphan();
+			var newNodes = tempContainer.query(">").orphan();
 			tempContainer.orphan();
 			
 			//Insert the new DOM nodes and update the Form's action URL