diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index 17a01d8eb..d2935b227 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -46,44 +46,44 @@ input {
 
 
 /* Torrent Details */
-.deluge-status-progressbar {
+.x-deluge-status-progressbar {
     margin: 5px;
 }
 
-.deluge-status {
+.x-deluge-status {
 	margin: 10px;
 }
 
-.deluge-status dl {
+.x-deluge-status dl {
 	float: left;
 	min-height: 120px;
 }
 
-.deluge-status dl dt {
+.x-deluge-status dl dt {
 	float: left;
 	font-weight: bold;
 	height: 19px;
 }
 
-.deluge-status dl dd {
+.x-deluge-status dl dd {
 	margin-left: 100px;
 	width: 140px;
 	height: 19px;
 }
 
-.deluge-status dd.downloaded, .deluge-status dd.uploaded, .deluge-status dd.share, .deluge-status dd.announce, .deluge-status dd.tracker_status, .deluge-status dd.active_time {
+.x-deluge-status dd.downloaded, .x-deluge-status dd.uploaded, .x-deluge-status dd.share, .x-deluge-status dd.announce, .x-deluge-status dd.tracker_status, .x-deluge-status dd.active_time {
 	width: 200px;
 }
 
-.deluge-status dd.downspeed, .deluge-status dd.upspeed, .deluge-status dd.eta, .deluge-status dd.pieces {
+.x-deluge-status dd.downspeed, .x-deluge-status dd.upspeed, .x-deluge-status dd.eta, .x-deluge-status dd.pieces {
 	margin-left: 100px;
 }
 
-.deluge-status form br {
+.x-deluge-status form br {
 	clear: left;
 }
 
-.deluge-status dd.torrent_name, .deluge-status dd.status, .deluge-status dd.tracker, .deluge-status dd.path, .deluge-status dd.comment {
+.x-deluge-status dd.torrent_name, .x-deluge-status dd.status, .x-deluge-status dd.tracker, .x-deluge-status dd.path, .x-deluge-status dd.comment {
 	width: auto;
 }
 
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 035f50123..83a952b3c 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -226,8 +226,7 @@ class TopLevel(resource.Resource):
     ]
     
     __scripts = [
-        "/js/mootools-1.2.1-core-yc.js",
-        "/js/ext-mootools-adapter.js",
+        "/js/ext-base.js",
         "/js/ext-all.js",
         "/js/ext-extensions.js",
         "/gettext.js",
@@ -235,22 +234,40 @@ class TopLevel(resource.Resource):
     ]
     
     __debug_scripts = [
-        "/js/mootools-1.2.1-core-yc.js",
-        "/js/ext-mootools-adapter.js",
+        "/js/ext-base.js",
         "/js/ext-all-debug.js",
         "/js/ext-extensions-debug.js",
         "/gettext.js",
-        "/js/rpc.js",
-        "/js/deluge.js",
-        "/js/deluge-login.js",
-        "/js/deluge-menus.js",
-        "/js/deluge-bars.js",
-        "/js/deluge-connections.js",
-        "/js/deluge-torrents.js",
-        "/js/deluge-details.js",
-        "/js/deluge-add.js",
-        "/js/deluge-preferences.js",
-        "/js/deluge-ui.js"
+        "/js/Deluge.js",
+        "/js/Deluge.Formatters.js",
+        "/js/Deluge.Menus.js",
+        "/js/Deluge.Events.js",
+        "/js/Deluge.Client.js",
+        "/js/Deluge.ConnectionManager.js",
+        "/js/Deluge.Details.js",
+        "/js/Deluge.Details.Status.js",
+        "/js/Deluge.Details.Details.js",
+        "/js/Deluge.Details.Files.js",
+        "/js/Deluge.Details.Peers.js",
+        "/js/Deluge.Details.Options.js",
+        "/js/Deluge.Keys.js",
+        "/js/Deluge.Login.js",
+        "/js/Deluge.Preferences.js",
+        "/js/Deluge.Preferences.Downloads.js",
+        "/js/Deluge.Preferences.Network.js",
+        "/js/Deluge.Preferences.Bandwidth.js",
+        "/js/Deluge.Preferences.Interface.js",
+        "/js/Deluge.Preferences.Other.js",
+        "/js/Deluge.Preferences.Daemon.js",
+        "/js/Deluge.Preferences.Queue.js",
+        "/js/Deluge.Preferences.Proxy.js",
+        "/js/Deluge.Preferences.Notification.js",
+        "/js/Deluge.Preferences.Plugins.js",
+        "/js/Deluge.Sidebar.js",
+        "/js/Deluge.Statusbar.js",
+        "/js/Deluge.Toolbar.js",
+        "/js/Deluge.Torrents.js",
+        "/js/Deluge.UI.js"
     ]
     
     def __init__(self):