diff --git a/demos/form2/index.html b/demos/form2/index.html
index 22d5d336..e33c19a0 100644
--- a/demos/form2/index.html
+++ b/demos/form2/index.html
@@ -3,13 +3,10 @@
     <head>
         <title>ox.js form demo</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
         <link rel="stylesheet" type="text/css" href="css/form.css"/>
         <script type="text/javascript" src="../../build/js/jquery-1.4.2.js"></script>
-        <script type="text/javascript" src="../../build/js/ox.js"></script>
-        <script type="text/javascript" src="../../build/js/ox.data.js"></script>
-        <script type="text/javascript" src="../../build/js/ox.data.js"></script>
-        <script type="text/javascript" src="../../build/js/ox.ui.js"></script>
+        <script type="text/javascript" src="../../source/js/_/ox.data.js"></script>
+        <script type="text/javascript" src="../../build/js/Ox.js"></script>
         <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
         <script type="text/javascript" src="js/form.js"></script>
         <!--<script>
diff --git a/demos/form2/js/form.js b/demos/form2/js/form.js
index f6705b70..49cf7f72 100644
--- a/demos/form2/js/form.js
+++ b/demos/form2/js/form.js
@@ -1,4 +1,4 @@
-$(function() {
+Ox.load('UI', function() {
 
     var $body = $("body"),
         $panel = $("<div>")
diff --git a/source/js/Ox.UI/Core/Ox.Theme.js b/source/js/Ox.UI/Core/Ox.Theme.js
index 276ac806..199ea017 100644
--- a/source/js/Ox.UI/Core/Ox.Theme.js
+++ b/source/js/Ox.UI/Core/Ox.Theme.js
@@ -28,7 +28,9 @@ Ox.Theme = function(theme) {
     function setTheme(theme) {
         var currentTheme = getTheme();
         if (theme != currentTheme) {
-            Ox.UI.$body.addClass('OxTheme' + Ox.toTitleCase(theme));
+            Ox.UI.$body
+                .addClass('OxTheme' + Ox.toTitleCase(theme))
+                .removeClass('OxTheme' + Ox.toTitleCase(currentTheme));
             $('img').add('input[type=image]').each(function() {
                 var $this = $(this);
                 $this.attr({
@@ -37,7 +39,7 @@ Ox.Theme = function(theme) {
                 });
             });
         }
-        return Ox.Theme;
+        return currentTheme;
     }
 
 };
