diff --git a/source/js/Ox.UI/Core/Ox.App.js b/source/js/Ox.UI/Core/Ox.App.js
index 6c24f234..5eb25e0a 100644
--- a/source/js/Ox.UI/Core/Ox.App.js
+++ b/source/js/Ox.UI/Core/Ox.App.js
@@ -79,7 +79,7 @@ Ox.App = (function() {
                 };
             });
             that.api.init(getUserData(), function(result) {
-                Ox.UI.hideLoadingScreen();
+                //Ox.UI.hideLoadingScreen();
                 that.triggerEvent({
                     load: result.data
                 });
diff --git a/source/js/Ox.UI/Core/Ox.Theme.js b/source/js/Ox.UI/Core/Ox.Theme.js
index 42fc3f51..d0a679b7 100644
--- a/source/js/Ox.UI/Core/Ox.Theme.js
+++ b/source/js/Ox.UI/Core/Ox.Theme.js
@@ -22,6 +22,7 @@ Ox.Theme = function(theme) {
                 return false;
             }
         });
+        Ox.print('getTheme', theme)
         return theme;
     }
 
@@ -35,11 +36,11 @@ Ox.Theme = function(theme) {
                 var $this = $(this);
                 $this.attr({
                     src: $this.attr('src')
-                        .replace('Ox.UI.' + currentTheme, 'Ox.UI.' + theme)
+                        .replace('/Ox.UI.' + currentTheme, '/Ox.UI.' + theme)
                 });
             });
         }
-        return currentTheme;
+        return theme;
     }
 
 };
diff --git a/source/js/Ox.UI/Ox.UI.js b/source/js/Ox.UI/Ox.UI.js
index 2a985d39..3dbaf1fe 100644
--- a/source/js/Ox.UI/Ox.UI.js
+++ b/source/js/Ox.UI/Ox.UI.js
@@ -43,7 +43,8 @@ Ox.load.UI = function(options, callback) {
 
     function showScreen() {
 
-        var body = Ox.element('body'),
+        var body = Ox.element('body')
+                .addClass('OxTheme' + Ox.toTitleCase(options.theme)),
             css = {
                 position: 'absolute',
                 left: 0,
@@ -170,7 +171,6 @@ Ox.load.UI = function(options, callback) {
                     .done(function() {
                         Ox.print('promises done')
                         $(function() {
-                            Ox.Theme(options.theme);
                             if (options.showScreen && options.hideScreen) {
                                 Ox.UI.hideLoadingScreen();
                             }
diff --git a/tools/build/build.py b/tools/build/build.py
index 606afdae..8af37d5c 100755
--- a/tools/build/build.py
+++ b/tools/build/build.py
@@ -57,8 +57,9 @@ for path, dirnames, filenames in os.walk(source_path + 'css/'):
     for filename in filenames:
         source = os.path.join(path, filename)
         target = source.replace(source_path, build_path)
-        copy_file(source, target)
-        append_file(target.replace(build_path, ''))
+        write_link(source, target)
+        if filename == 'Ox.UI.css':
+            append_file(target.replace(build_path, ''))
 
 # js
 filename = 'js/Ox.js'