diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
index 6dd6f3f23b..1144aba7ca 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
@@ -21,18 +21,6 @@ namespace Umbraco.Tests.PublishedContent
 			get { return DatabaseBehavior.NewSchemaPerFixture; }
 		}
 
-		[SetUp]
-		public override void Initialize()
-		{
-			base.Initialize();
-		}
-
-		[TearDown]
-		public override void TearDown()
-		{
-			base.TearDown();
-		}
-
 		protected override string GetXmlContent(int templateId)
 		{
 			return xmlContent;
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 69dd00ce1a..edc25e7cac 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -754,6 +754,7 @@
     <Content Include="Umbraco\Images\thumbs_smll.png" />
     <Content Include="Umbraco\Images\Umbraco\settingView.gif" />
     <Content Include="Umbraco\Settings\Views\EditView.aspx" />
+    <Content Include="Umbraco_Client\Application\Extensions.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.unobtrusive.min.js" />
diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
index 8174330609..2b932bd027 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
@@ -1,23 +1,15 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="umbraco.controls.Tree.TreeControl" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 
 <umb:CssInclude ID="CssInclude2" runat="server" FilePath="Tree/treeIcons.css" PathNameAlias="UmbracoClient" Priority="10" />
 <umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
 <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Tree/Themes/umbraco/style.css" PathNameAlias="UmbracoClient" Priority="12" />
 
-<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
-<umb:JsInclude ID="JsInclude2" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
-<umb:JsInclude ID="JsInclude3" runat="server" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" />
-<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" />
-<umb:JsInclude ID="JsInclude5" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
-<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/JQuery/jquery.metadata.min.js" PathNameAlias="UmbracoClient" Priority="10" />
-<umb:JsInclude ID="JsInclude8" runat="server" FilePath="Tree/jquery.tree.js" PathNameAlias="UmbracoClient" Priority="11"  />
-<umb:JsInclude ID="JsInclude11" runat="server" FilePath="Tree/UmbracoContext.js" PathNameAlias="UmbracoClient" Priority="12"  />
-<umb:JsInclude ID="JsInclude7" runat="server" FilePath="Tree/jquery.tree.contextmenu.js" PathNameAlias="UmbracoClient" Priority="12"  />
-<umb:JsInclude ID="JsInclude12" runat="server" FilePath="Tree/jquery.tree.checkbox.js" PathNameAlias="UmbracoClient" Priority="12"  />
-<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Tree/NodeDefinition.js" PathNameAlias="UmbracoClient" Priority="12"  />
-<umb:JsInclude ID="JsInclude10" runat="server" FilePath="Tree/UmbracoTree.js" PathNameAlias="UmbracoClient" Priority="13" />
-
+<umbClient:JsApplicationLib ID="JsUmbracoApplicationLib1" runat="server"/>
+<umbClient:JsJQueryCore ID="JsJQueryCore1" runat="server"/>
+<umbClient:JsJQueryPlugins ID="JsJQueryPlugins1" runat="server"/>
+<umbClient:JsUmbracoTree  runat="server"/>
 
 <script type="text/javascript">
 jQuery(document).ready(function() {
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs
index b07d0a35c9..66f2c928bd 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoDialog.master.designer.cs
@@ -20,23 +20,5 @@ namespace Umbraco.Web.UI.Umbraco.Masterpages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ContentPlaceHolder DocType;
-        
-        /// <summary>
-        /// JsInclude11 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude11;
-        
-        /// <summary>
-        /// JsInclude12 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude12;
     }
 }
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
index 2cc35025cf..52f17f5672 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
@@ -20,32 +20,5 @@ namespace Umbraco.Web.UI.Umbraco.Masterpages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ContentPlaceHolder DocType;
-        
-        /// <summary>
-        /// JsInclude10 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude10;
-        
-        /// <summary>
-        /// JsInclude11 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude11;
-        
-        /// <summary>
-        /// JsInclude12 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude12;
     }
 }
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
index 4b7150938e..0c3afc0372 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
@@ -2,6 +2,7 @@
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
@@ -11,13 +12,11 @@
 
     <!-- Default script and style -->
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="assets/css/umbraco.css" PathNameAlias="UmbracoRoot" />
-
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
-    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="1" />
-    <umb:JsInclude ID="JsInclude6" runat="server" FilePath="ui/base2.js" PathNameAlias="UmbracoClient" Priority="1" />
-    <umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude11" runat="server" FilePath="UI/knockout.js" PathNameAlias="UmbracoClient" Priority="3" />
-    <umb:JsInclude ID="JsInclude12" runat="server" FilePath="UI/knockout.mapping.js" PathNameAlias="UmbracoClient" Priority="4" />
+    
+    <umbClient:JsApplicationLib runat="server"/>
+    <umbClient:JsJQueryCore runat="server"/>
+    <umbClient:JsUmbracoApplicationCore runat="server"/>
+    
 
     <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="5" />
 
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
index 192080e476..4a7fc58a23 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
@@ -3,6 +3,7 @@
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -11,16 +12,11 @@
 
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="assets/css/umbraco.css" PathNameAlias="UmbracoRoot" />
     
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
-    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
-    <umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" Priority="1" />
-<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.cookie.js" PathNameAlias="UmbracoClient" Priority="1" />
-    <umb:JsInclude ID="JsInclude10" runat="server" FilePath="ui/base2.js" PathNameAlias="UmbracoClient" Priority="1"  /> 
-    <umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" Priority="2" />
-    <umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="3" />
-    <umb:JsInclude ID="JsInclude11" runat="server" FilePath="UI/knockout.js" PathNameAlias="UmbracoClient" Priority="3" />
-    <umb:JsInclude ID="JsInclude12" runat="server" FilePath="UI/knockout.mapping.js" PathNameAlias="UmbracoClient" Priority="4" />
+    <umbClient:JsApplicationLib runat="server"/>
+    <umbClient:JsJQueryCore runat="server"/>
+    <umbClient:JsUmbracoApplicationCore runat="server"/>
+    <umbClient:JsJQueryPlugins runat="server"/>
+    
     <umb:JsInclude ID="JsInclude7" runat="server" FilePath="modal/modal.js" PathNameAlias="UmbracoClient" Priority="10" />
     <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="10" />
     <umb:JsInclude ID="JsIncludeHotkeys" runat="server" FilePath="Application/jQuery/jquery.hotkeys.js" PathNameAlias="UmbracoClient" Priority="10" />
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js b/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js
index bed8630cf5..5bab77a931 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js
@@ -23,7 +23,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
             onNavigate: function(e) {
                 var fragment = getHashFragment($.param.fragment());
                 if (fragment != "") {
-                    jQuery(window.top).trigger("navigating", [fragment]); //raise event!   
+                    $(window.top).trigger("navigating", [fragment]); //raise event!   
                 }
                 
             },
@@ -43,11 +43,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
 
             addEventHandler: function(fnName, fn) {
                 /// <summary>Adds an event listener to the event name event</summary>
-                if (typeof (jQuery) != "undefined") jQuery(window.top).bind(fnName, fn); //if there's no jQuery, there is no events
+                if (typeof ($) != "undefined") $(window.top).bind(fnName, fn); //if there's no jQuery, there is no events
             },
             removeEventHandler: function(fnName, fn) {
                 /// <summary>Removes an event listener to the event name event</summary>
-                if (typeof (jQuery) != "undefined") jQuery(window.top).unbind(fnName, fn); //if there's no jQuery, there is no events
+                if (typeof ($) != "undefined") $(window.top).unbind(fnName, fn); //if there's no jQuery, there is no events
             }
         };
 
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
index e5dc8b96b5..3752d2e24e 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
@@ -4,8 +4,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Utils");
 
 Umbraco.Utils.generateRandom = function() {
     /// <summary>Returns a random integer for use with URLs</summary>
-    day = new Date()
-    z = day.getTime()
-    y = (z - (parseInt(z / 1000, 10) * 1000)) / 10
-    return y
+    var day = new Date();
+    var z = day.getTime();
+    var y = (z - (parseInt(z / 1000, 10) * 1000)) / 10;
+    return y;
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 0b25dc63c3..c06c8bcd1f 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -303,7 +303,7 @@ namespace Umbraco.Web
                                                object htmlAttributes,
                                                FormMethod method)
         {
-            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, htmlAttributes.ToDictionary<object>(), method);
+            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
         }
 
         /// <summary>
@@ -319,7 +319,7 @@ namespace Umbraco.Web
 											   object additionalRouteVals,
 											   object htmlAttributes)
 		{
-			return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, htmlAttributes.ToDictionary<object>());
+            return html.BeginUmbracoForm(action, controllerName, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
 		}
 
         /// <summary>
@@ -487,7 +487,7 @@ namespace Umbraco.Web
                                                object htmlAttributes,
                                                FormMethod method)
         {
-            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, htmlAttributes.ToDictionary<object>(), method);
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes), method);
         }
 
         /// <summary>
@@ -503,7 +503,7 @@ namespace Umbraco.Web
 											   object additionalRouteVals,
 											   object htmlAttributes)
 		{
-			return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, htmlAttributes.ToDictionary<object>());
+            return html.BeginUmbracoForm(action, surfaceType, additionalRouteVals, HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes));
 		}
 
         /// <summary>
diff --git a/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs b/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
new file mode 100644
index 0000000000..afe70ad4d1
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsApplicationLib.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary>
+    /// The core libs that have no dependencies
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient", Priority = 0, Group = 0)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoUtils.js", "UmbracoClient", Priority = 1, Group = 0)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/json2.js", "UmbracoClient", Priority = 2, Group = 0)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 3, Group = 0)]
+    [ClientDependency(ClientDependencyType.Javascript, "UI/knockout.js", "UmbracoClient", Priority = 4, Group = 0)]
+    [ClientDependency(ClientDependencyType.Javascript, "UI/knockout.mapping.js", "UmbracoClient", Priority = 5, Group = 0)]
+    public class JsApplicationLib : Control
+    {
+    }
+}
diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs
new file mode 100644
index 0000000000..621ecd214c
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs
@@ -0,0 +1,14 @@
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary>
+    /// The core Jquery libs
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 0, Group = 1)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient", Priority = 1, Group = 1)]
+    public class JsJQueryCore : Control
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs
new file mode 100644
index 0000000000..48ff2f38dc
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsJQueryPlugins.cs
@@ -0,0 +1,18 @@
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary>
+    /// The core Jquery libs
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.ba-bbq.min.js", "UmbracoClient", Priority = 0, Group = 4)]
+    [ClientDependency(ClientDependencyType.Javascript, "ui/jQueryWresize.js", "UmbracoClient", Priority = 1, Group = 4)]
+    [ClientDependency(ClientDependencyType.Javascript, "modal/jquery.simplemodal.1.4.1.custom.js", "UmbracoClient", Priority = 2, Group = 4)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.cookie.js", "UmbracoClient", Priority = 3, Group = 4)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/JQuery/jquery.metadata.min.js", "UmbracoClient", Priority = 4, Group = 4)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery.hotkeys.js", "UmbracoClient", Priority = 5, Group = 4)]
+    public class JsJQueryPlugins : Control
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
new file mode 100644
index 0000000000..17ae644c81
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationCore.cs
@@ -0,0 +1,16 @@
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary>
+    /// The core libs that require JQuery to be loaded
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "Application/Extensions.js", "UmbracoClient", Priority = 0, Group = 2)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoApplicationActions.js", "UmbracoClient", Priority = 1, Group = 2)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/HistoryManager.js", "UmbracoClient", Priority = 2, Group = 2)]
+    [ClientDependency(ClientDependencyType.Javascript, "Application/UmbracoClientManager.js", "UmbracoClient", Priority = 3, Group = 3)]
+    public class JsUmbracoApplicationCore : Control
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs
new file mode 100644
index 0000000000..c8bce7694a
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsUmbracoApplicationUI.cs
@@ -0,0 +1,17 @@
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary>
+    /// The UI Umbraco libs 
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "ui/default.js", "UmbracoClient", Priority = 0, Group = 5)]
+    [ClientDependency(ClientDependencyType.Javascript, "js/guiFunctions.js", "UmbracoRoot", Priority = 1, Group = 5)]
+    [ClientDependency(ClientDependencyType.Javascript, "modal/modal.js", "UmbracoClient", Priority = 2, Group = 5)]
+    [ClientDependency(ClientDependencyType.Javascript, "js/UmbracoSpeechBubbleBackend.js", "UmbracoRoot", Priority = 3, Group = 5)]
+    [ClientDependency(ClientDependencyType.Javascript, "modal/modal.js", "UmbracoClient", Priority = 2, Group = 5)]
+    public class JsUmbracoApplicationUI : Control
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs b/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs
new file mode 100644
index 0000000000..7af2046991
--- /dev/null
+++ b/src/Umbraco.Web/UI/Bundles/JsUmbracoTree.cs
@@ -0,0 +1,18 @@
+using System.Web.UI;
+using ClientDependency.Core;
+
+namespace Umbraco.Web.UI.Bundles
+{
+    /// <summary> 
+    /// The umb tree libs
+    /// </summary>
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.js", "UmbracoClient", Priority = 0, Group = 10)]
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/UmbracoContext.js", "UmbracoClient", Priority = 1, Group = 10)]
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.contextmenu.js", "UmbracoClient", Priority = 2, Group = 10)]
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/jquery.tree.checkbox.js", "UmbracoClient", Priority = 3, Group = 10)]
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/NodeDefinition.js", "UmbracoClient", Priority = 4, Group = 10)]
+    [ClientDependency(ClientDependencyType.Javascript, "Tree/UmbracoTree.js", "UmbracoClient", Priority = 5, Group = 10)]
+    public class JsUmbracoTree : Control
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
index 97512dff17..a63b55f791 100644
--- a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
+++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
@@ -4,17 +4,14 @@ using System.Text;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using ClientDependency.Core;
+using Umbraco.Web.UI.Bundles;
 using umbraco.BasePages;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Web.UI.Controls
 {
     [ClientDependency(ClientDependencyType.Css, "ContextMenu/Css/jquery.contextMenu.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Css, "FolderBrowser/Css/folderbrowser.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 1)]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/base2.js", "UmbracoClient", Priority = 1)]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/knockout.js", "UmbracoClient", Priority = 3)]
-    [ClientDependency(ClientDependencyType.Javascript, "ui/knockout.mapping.js", "UmbracoClient", Priority = 4)]
+    [ClientDependency(ClientDependencyType.Css, "FolderBrowser/Css/folderbrowser.css", "UmbracoClient")]    
     [ClientDependency(ClientDependencyType.Javascript, "ContextMenu/Js/jquery.contextMenu.js", "UmbracoClient", Priority = 5)]
     [ClientDependency(ClientDependencyType.Javascript, "FileUploader/js/jquery.fileUploader.js", "UmbracoClient", Priority = 6)]
     [ClientDependency(ClientDependencyType.Javascript, "FolderBrowser/js/folderbrowser.js", "UmbracoClient", Priority = 10)]
@@ -68,6 +65,10 @@ namespace Umbraco.Web.UI.Controls
         /// </summary>
         protected override void CreateChildControls()
         {
+            //Ensure the bundles are added
+            Controls.Add(new JsApplicationLib());
+            Controls.Add(new JsJQueryCore());
+
             // Create the panel surround
             Panel = new Panel
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ee25385b67..7e1d051c5f 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -619,6 +619,12 @@
     </Compile>
     <Compile Include="UI\JavaScript\ServerVariablesParser.cs" />
     <Compile Include="Strategies\Migrations\RebuildMediaXmlCacheAfterUpgrade.cs" />
+    <Compile Include="UI\Bundles\JsApplicationLib.cs" />
+    <Compile Include="UI\Bundles\JsJQueryCore.cs" />
+    <Compile Include="UI\Bundles\JsJQueryPlugins.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationCore.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoApplicationUI.cs" />
+    <Compile Include="UI\Bundles\JsUmbracoTree.cs" />
     <Compile Include="UI\CdfLogger.cs" />
     <Compile Include="umbraco.presentation\CompatibilityHelper.cs" />
     <Compile Include="umbraco.presentation\umbraco\controls\PasswordChanger.ascx.cs">