diff --git a/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp b/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
index 958490790..f9982e77b 100644
--- a/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
@@ -1,4 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
@@ -12,7 +13,7 @@
    function after() {alert("after request");}
    function handler(widget, node) {
      alert('I will handle this myself!');
-   dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
+     dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
    }
 
     dojo.event.topic.subscribe("/after", function(data, type, e){
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
index 99ccc84a6..47f8fa6b9 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -11,12 +12,11 @@
 
 
 <body>
-<s:div
+<sx:div
         id="once"
-        theme="ajax"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}">
-    Initial Content</s:div>
+    Initial Content</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
index 09034b7dd..c4dadc923 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -17,13 +18,12 @@
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
 <body>
-<s:div
+<sx:div
         id="once"
-        theme="ajax"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
 		handler="handler">
-    Initial Content</s:div>
+    Initial Content</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
index f2c320d8c..261aaffbd 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -12,15 +13,14 @@
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
 
-<s:div
+<sx:div
         id="once"
-        theme="ajax"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
         updateFreq="2000"
         indicator="indicator"
 		>
-    Initial Content</s:div>
+    Initial Content</sx:div>
 <img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
index b5ef77069..ba640401f 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -12,14 +13,13 @@
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
 
-<s:div
+<sx:div
         id="twoseconds"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
-        theme="ajax"
         delay="2000"
         updateFreq="%{#parameters.period}"
-        errorText="There was an error">Initial Content</s:div>
+        errorText="There was an error">Initial Content</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
index 6b93de8c6..077ee5ab3 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -11,15 +12,14 @@
 
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
-<s:div
+<sx:div
         id="fiveseconds"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
-        theme="ajax"
         delay="1000"
         updateFreq="5000"
         errorText="There was an error"
-        loadingText="reloading">loading now</s:div>
+        loadingText="reloading">loading now</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
index 75b6e1928..b83d1bf99 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -11,14 +12,13 @@
 
 <s:url id="ajaxNoUrl" value="/AjaxNoUrl.jsp" />
 
-<s:div
+<sx:div
         id="error"
         cssStyle="border: 1px solid yellow;"
         href="/AjaxNoUrl.jsp"
-        theme="ajax"
         delay="1000"
         errorText="Could not contact server"
-        loadingText="reloading">loading now</s:div>
+        loadingText="reloading">loading now</sx:div>
 
 
 <s:include value="../footer.jsp"/>
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
index 3088742bc..b33caf900 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -9,14 +10,13 @@
 
 <body>
 
-<s:div
+<sx:div
         id="error"
         cssStyle="border: 1px solid yellow;"
         href="/AjaxNoUrl.jsp"
-        theme="ajax"
         delay="1000"
         showErrorTransportText="true"
-        loadingText="reloading">loading now</s:div>
+        loadingText="reloading">loading now</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
index 356d62c44..970783a81 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -12,14 +13,13 @@
 <s:url id="test3" value="/Test3.action" />
 
 
-<s:div
+<sx:div
         id="error"
         cssStyle="border: 1px solid yellow;"
         href="%{test3}"
-        theme="ajax"
         delay="1000"
 		executeScripts="true"
-        loadingText="reloading">loading now</s:div>
+        loadingText="reloading">loading now</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
index 37fc6da14..de28e5ccf 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -35,9 +36,8 @@
 
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
-<s:div
+<sx:div
         id="once"
-        theme="ajax"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
         loadingText="Loading..."
@@ -48,7 +48,7 @@
 		autoStart="true"
 		formId="form"
 		>
-    Initial Content</s:div>
+    Initial Content</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp b/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
index 3ea37dc99..4520c123d 100644
--- a/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -35,9 +36,8 @@
 
 <s:url id="ajaxTest" value="/AjaxTest.action" />
 
-<s:div
+<sx:div
         id="once"
-        theme="ajax"
         cssStyle="border: 1px solid yellow;"
         href="%{ajaxTest}"
         listenTopics="/refresh"
@@ -48,7 +48,7 @@
 		afterLoading="alert('after request')"
         notifyTopics="/after"
 		>
-    Initial Content</s:div>
+    Initial Content</sx:div>
 
 <s:include value="../footer.jsp"/>
 
diff --git a/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp b/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
index b4125de65..dab0ddd4b 100644
--- a/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
+++ b/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -36,44 +37,39 @@
 
 <br/><br/>
 
-<s:a
-        theme="ajax"
+<sx:a
         href="%{ajaxTest}"
         indicator="indicator"
-		targets="t1,t2" notifyTopics="/after" >Update 'Div 1' and 'Div 2', publish topic '/after', use indicator</s:a>
+		targets="t1,t2" notifyTopics="/after" >Update 'Div 1' and 'Div 2', publish topic '/after', use indicator</sx:a>
 <img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
 
 <br/><br/>
 
-<s:a  id="link2"
-        theme="ajax"
+<sx:a  id="link2"
         href="/AjaxNoUrl.jsp"
 		errorText="Error Loading"
-		targets="t1">Try to update 'Div 1', use custom error message</s:a>
+		targets="t1">Try to update 'Div 1', use custom error message</sx:a>
 
 <br/><br/>
 
-<s:a  id="link3"
-        theme="ajax"
+<sx:a  id="link3"
         href="%{ajaxTest}"
 		loadingText="Loading!!!"
-		targets="t1">Update 'Div 1', use custom loading message</s:a>
+		targets="t1">Update 'Div 1', use custom loading message</sx:a>
 
 <br/><br/>
 
-<s:a  id="link4"
-        theme="ajax"
+<sx:a  id="link4"
         href="%{test3}"
 		executeScripts="true"
-		targets="t2">Update 'Div 2' and execute returned javascript </s:a>
+		targets="t2">Update 'Div 2' and execute returned javascript </sx:a>
 
 <br/><br/>
 
-<s:a  id="link5"
-        theme="ajax"
+<sx:a  id="link5"
         href="%{ajaxTest}"
 		handler="handler"
-		targets="t2">Update 'Div 2' using a custom handler </s:a>
+		targets="t2">Update 'Div 2' using a custom handler </sx:a>
 
 
 <br/><br/>
@@ -86,12 +82,11 @@
 
 <br/><br/>
 
-<s:a  id="link6"
-        theme="ajax"
+<sx:a  id="link6"
         href="%{ajaxTest}"
 		targets="t2"
 		formId="form"
-		>Update 'Div 2' with the content of the textbox </s:a>
+		>Update 'Div 2' with the content of the textbox </sx:a>
 
 
 <br/><br/>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
index ff9a99c9b..b34f047fc 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
+++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+ <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
  
 <html>
 <head>
@@ -29,81 +30,81 @@
     <table cellpadding="0" cellspacing="10" border="0" width="600">
         <tr>
             <td align="top">
-                <s:tabbedPanel id="test" >
-                    <s:div id="one" label="one" theme="ajax">
+                <sx:tabbedPanel id="test" >
+                    <sx:div id="one" label="one" >
                         This is the first pane<br/>
                         <s:form>
                             <s:textfield name="tt" label="Test Text"/>  <br/>
                             <s:textfield name="tt2" label="Test Text2"/>
                         </s:form>
-                    </s:div>
-                    <s:div id="two" label="two" theme="ajax">
+                    </sx:div>
+                    <sx:div id="two" label="two" >
                         This is the second panel
-                    </s:div>
-                    <s:div id="three" label="three" theme="ajax">
+                    </sx:div>
+                    <sx:div id="three" label="three" >
                         This is the three
-                    </s:div>
-                </s:tabbedPanel>
+                    </sx:div>
+                </sx:tabbedPanel>
             </td>
             <td align="top">
-                <s:tabbedPanel id="test2" >
-                    <s:div id="left" label="left" theme="ajax">
+                <sx:tabbedPanel id="test2" >
+                    <sx:div id="left" label="left" >
                         This is the left pane<br/>
                         <s:form>
                             <s:textfield name="tt" label="Test Text"/>  <br/>
                             <s:textfield name="tt2" label="Test Text2"/>
                         </s:form>
-                    </s:div>
-                    <s:div href="%{ajaxTest}" id="ryh1" theme="ajax"
-                                    label="remote one"></s:div>
-                    <s:div id="middle" label="middle" theme="ajax">
+                    </sx:div>
+                    <sx:div href="%{ajaxTest}" id="ryh1" 
+                                    label="remote one"></sx:div>
+                    <sx:div id="middle" label="middle" >
                         middle tab<br/>
                         <s:form>
                             <s:textfield name="tt" label="Test Text44"/>  <br/>
                             <s:textfield name="tt2" label="Test Text442"/>
                         </s:form>
-                    </s:div>
-                    <s:div  href="%{ajaxTest}" id="ryh21" theme="ajax" label="remote right"/>
-                </s:tabbedPanel>
+                    </sx:div>
+                    <sx:div  href="%{ajaxTest}" id="ryh21"  label="remote right"/>
+                </sx:tabbedPanel>
             </td>
         </tr>
         <tr>
             <td align="top">
-                <s:tabbedPanel id="testremote">
-                    <s:div  href="%{ajaxTest}" id="r1" theme="ajax" label="remote one">
+                <sx:tabbedPanel id="testremote">
+                    <sx:div  href="%{ajaxTest}" id="r1"  label="remote one">
                         <s:action name="AjaxTest" executeResult="true" />
-                    </s:div>
-                    <s:div  href="%{ajaxTest}" id="r2" theme="ajax" label="remote two"></s:div>
-                    <s:div  href="%{ajaxTest}" id="r3" theme="ajax" label="remote three"></s:div>
-                </s:tabbedPanel>
+                    </sx:div>
+                    <sx:div  href="%{ajaxTest}" id="r2"  label="remote two"></sx:div>
+                    <sx:div  href="%{ajaxTest}" id="r3"  label="remote three"></sx:div>
+                </sx:tabbedPanel>
             </td>
             <td align="top">
-                <s:tabbedPanel id="test3" >
-                    <s:div id="left1" label="out one" theme="ajax">
+                <sx:tabbedPanel id="test3" >
+                    <sx:div id="left1" label="out one" >
                         Outer one<br/>
-                        <s:tabbedPanel id="test11">
-                            <s:div id="i11" label="inner 1 one">Inner 1</s:div>
-                            <s:div id="112" label="inner 1 two">Inner 2</s:div>
-                            <s:div id="i13" label="inner 1 three">Inner 3</s:div>
-                        </s:tabbedPanel>
-                    </s:div>
-                    <s:div id="middle1" label="out two" theme="ajax">
+                        <sx:tabbedPanel id="test11">
+                            <sx:div id="i11" label="inner 1 one">Inner 1</sx:div>
+                            <sx:div id="112" label="inner 1 two">Inner 2</sx:div>
+                            <sx:div id="i13" label="inner 1 three">Inner 3</sx:div>
+                        </sx:tabbedPanel>
+                    </sx:div>
+                    <sx:div id="middle1" label="out two" >
                         Outer two<br/>
-                        <s:tabbedPanel id="test12" >
-                            <s:div id="i21" label="inner 2 one" theme="ajax">Inner 21</s:div>
-                            <s:div id="122" label="inner 2 two" theme="ajax">Inner 22</s:div>
-                            <s:div id="i23" label="inner 2 three" theme="ajax">Inner 23</s:div>
-                        </s:tabbedPanel>
-                    </s:div>
-                    <s:div id="right1" label="out three" theme="ajax">
+                        <sx:tabbedPanel id="test12" >
+                            <sx:div id="i21" label="inner 2 one" >Inner 21</sx:div>
+                            <sx:div id="122" label="inner 2 two" >Inner 22</sx:div>
+                            <sx:div id="i23" label="inner 2 three" >Inner 23</sx:div>
+                        </sx:tabbedPanel>
+                    </sx:div>
+                    <sx:div id="right1" label="out three" >
                         Outer three<br/>
-                        <s:tabbedPanel id="test13">
-                            <s:div id="i31" label="inner 3 one" theme="ajax">Inner 31</s:div>
-                            <s:div id="132" label="inner 3 two" theme="ajax">Inner 32</s:div>
-                            <s:div id="i33" label="inner 3 three" theme="ajax">Inner 33</s:div>
-                        </s:tabbedPanel>
-                    </s:div>
-                </s:tabbedPanel>
+                        <sx:tabbedPanel id="test13">
+                            <sx:div id="i31" label="inner 3 one" >Inner 31</sx:div>
+                            <sx:div id="132" label="inner 3 two" >Inner 32</sx:div>
+                            <sx:div id="i33" label="inner 3 three" >Inner 33</sx:div>
+                        </sx:tabbedPanel>
+                    </sx:div>
+                </sx:tabbedPanel>
             </td>
         </tr>
     </table>
diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
index ab2d7118f..69bb82dae 100644
--- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
+++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 
 <html>
 <head>
@@ -13,15 +14,15 @@
 
 <body>
 
-				<s:tabbedPanel id="test2" theme="simple" cssStyle="width: 500px; height: 300px;" doLayout="true">
-                      <s:div id="left" label="test1" theme="ajax" >
+				<sx:tabbedpanel id="test2" cssStyle="width: 500px; height: 300px;" doLayout="true">
+                      <sx:div id="left" label="test1"  >
                           I'm a Tab!!!
-                      </s:div >
-                      <s:div  id="middle" label="test2"  theme="ajax" >
+                      </sx:div >
+                      <sx:div  id="middle" label="test2"   >
                           I'm the other Tab!!!
-                      </s:div >
+                      </sx:div >
                      
-                  </s:tabbedPanel>
+                  </xs:tabbedpanel>
 				  
 				
 

- - + + This is the first pane - - + + This is the second panel - - + + This is the three - - + +	- - + + This is the left pane - - - + + + middle tab - - - + + +
- - + + - - - - + + + +	- - + + Outer one - - Inner 1 - Inner 2 - Inner 3 - - - + + Inner 1 + Inner 2 + Inner 3 + + + Outer two - - Inner 21 - Inner 22 - Inner 23 - - - + + Inner 21 + Inner 22 + Inner 23 + + + Outer three - - Inner 31 - Inner 32 - Inner 33 - - - + + Inner 31 + Inner 32 + Inner 33 + + +