diff --git a/deluge/ui/web/js/deluge-all/.build b/deluge/ui/web/js/deluge-all/.build
index b780351ab..0a7a4af44 100644
--- a/deluge/ui/web/js/deluge-all/.build
+++ b/deluge/ui/web/js/deluge-all/.build
@@ -1,45 +1,59 @@
 #!/bin/sh
 
+add_file "data/SortTypes.js"
+add_file "data/PeerRecord.js"
+add_file "data/TorrentRecord.js"
+add_file "details/DetailsPanel.js"
+add_file "details/DetailsTab.js"
+add_file "details/FilesTab.js"
+add_file "details/OptionsTab.js"
+add_file "details/PeersTab.js"
+add_file "details/StatusTab.js"
+add_file "add/Window.js"
+add_file "add/AddWindow.js"
+add_file "add/FileWindow.js"
+add_file "add/FilesTab.js"
+add_file "add/Infohash.js"
+add_file "add/OptionsPanel.js"
+add_file "add/OptionsTab.js"
+add_file "add/UrlWindow.js"
+add_file "preferences/BandwidthPage.js"
+add_file "preferences/CachePage.js"
+add_file "preferences/DaemonPage.js"
+add_file "preferences/DownloadsPage.js"
+add_file "preferences/EncryptionPage.js"
+add_file "preferences/InstallPluginWindow.js"
+add_file "preferences/InterfacePage.js"
+add_file "preferences/NetworkPage.js"
+add_file "preferences/OtherPage.js"
+add_file "preferences/PluginsPage.js"
+add_file "preferences/PreferencesWindow.js"
+add_file "preferences/ProxyField.js"
+add_file "preferences/ProxyPage.js"
+add_file "preferences/QueuePage.js"
+add_file "StatusbarMenu.js"
+add_file "OptionsManager.js"
+add_file "AddConnectionWindow.js"
+add_file "AddTrackerWindow.js"
+add_file "Client.js"
+add_file "ConnectionManager.js"
 add_file "Deluge.js"
-add_file "Deluge.Formatters.js"
-add_file "Deluge.Keys.js"
-add_file "Deluge.Menus.js"
-add_file "Deluge.data.SortTypes.js"
-add_file "Deluge.EventsManager.js"
-add_file "Deluge.OptionsManager.js"
-add_file "Deluge.MultiOptionsManager.js"
-add_file "Deluge.Add.js"
-add_file "Deluge.Add.File.js"
-add_file "Deluge.Add.Url.js"
-add_file "Deluge.Client.js"
-add_file "Deluge.ConnectionManager.js"
-add_file "Deluge.Details.js"
-add_file "Deluge.Details.Status.js"
-add_file "Deluge.Details.Details.js"
-add_file "Deluge.Details.Files.js"
-add_file "Deluge.Details.Peers.js"
-add_file "Deluge.Details.Options.js"
-add_file "Deluge.EditTrackers.js"
-add_file "Deluge.FileBrowser.js"
-add_file "Deluge.Login.js"
-add_file "Deluge.MoveStorage.js"
-add_file "Deluge.Plugin.js"
-add_file "Deluge.Preferences.js"
-add_file "Deluge.Preferences.Downloads.js"
-add_file "Deluge.Preferences.Network.js"
-add_file "Deluge.Preferences.Encryption.js"
-add_file "Deluge.Preferences.Bandwidth.js"
-add_file "Deluge.Preferences.Interface.js"
-add_file "Deluge.Preferences.Other.js"
-add_file "Deluge.Preferences.Daemon.js"
-add_file "Deluge.Preferences.Queue.js"
-add_file "Deluge.Preferences.Proxy.js"
-add_file "Deluge.Preferences.Cache.js"
-add_file "Deluge.Preferences.Plugins.js"
-add_file "Deluge.Remove.js"
-add_file "Deluge.Sidebar.js"
-add_file "Deluge.Statusbar.js"
-add_file "Deluge.Toolbar.js"
-add_file "Deluge.Torrent.js"
-add_file "Deluge.Torrents.js"
-add_file "Deluge.UI.js"
+add_file "EditTrackerWindow.js"
+add_file "EditTrackersWindow.js"
+add_file "EventsManager.js"
+add_file "FileBrowser.js"
+add_file "FilterPanel.js"
+add_file "Formatters.js"
+add_file "Keys.js"
+add_file "LoginWindow.js"
+add_file "Menus.js"
+add_file "MoveStorage.js"
+add_file "MultiOptionsManager.js"
+add_file "OtherLimitWindow.js"
+add_file "Plugin.js"
+add_file "RemoveWindow.js"
+add_file "Sidebar.js"
+add_file "Statusbar.js"
+add_file "Toolbar.js"
+add_file "TorrentGrid.js"
+add_file "UI.js"
diff --git a/deluge/ui/web/js/ext-extensions/.build b/deluge/ui/web/js/ext-extensions/.build
index f74086868..3888cc0c7 100644
--- a/deluge/ui/web/js/ext-extensions/.build
+++ b/deluge/ui/web/js/ext-extensions/.build
@@ -1,16 +1,20 @@
 #!/bin/sh
 
-add_file "BufferView.js"
-add_file "FileUploadField.js"
+add_file "layout/FormLayoutFix.js"
+add_file "tree/TreeGrid.js"
+add_file "tree/TreeGridColumnResizer.js"
+add_file "tree/TreeGridColumns.js"
+add_file "tree/TreeGridLoader.js"
+add_file "tree/TreeGridNodeUI.js"
+add_file "tree/TreeGridNodeUIFix.js"
+add_file "tree/TreeGridRenderColumn.js"
+add_file "tree/TreeGridSorter.js"
+add_file "grid/BufferView.js"
+add_file "form/FileUploadField.js"
+add_file "form/RadioGroupFix.js"
+add_file "form/SpinnerField.js"
+add_file "form/SpinnerGroup.js"
+add_file "form/ToggleField.js"
 add_file "JSLoader.js"
 add_file "Spinner.js"
-add_file "SpinnerField.js"
 add_file "StatusBar.js"
-add_file "ToggleField.js"
-add_file "TreeGridSorter.js"
-add_file "TreeGridColumnResizer.js"
-add_file "TreeGridNodeUI.js"
-add_file "TreeGridLoader.js"
-add_file "TreeGridColumns.js"
-add_file "TreeGridRenderColumn.js"
-add_file "TreeGrid.js"