82 files changed, 3309 insertions, 3313 deletions

diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index 0374e6a3..a9fbfbd9 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -12,15 +12,7 @@
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         
         <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://colorwheel/uuid?mId=js/components/colorwheel", {
-                        "element": E("#colorwheel")
-                        })
-                }
-                </script>
-                
+
                 <script type="text/montage-serialization">
                         {
                 "owner": {
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 361e36b2..f71c6705 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -12,15 +12,7 @@
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         
         <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
-                
-                <script type="text/m-objects">
-                {
-                        "$rootObject": U("m-obj://gradientpicker/uuid?mId=js/components/gradientpicker", {
-                        "element": E("#gradientpicker")
-                        })
-                }
-                </script>
-                
+
                 <script type="text/montage-serialization">
                         {
                 "owner": {
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f35972b6..597577f1 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
 
             parentNode = this.container;
 
-            while(parentNode.id !== "UserContent") {
+            // This is for the old template support.
+            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
+            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
+                while(parentNode.id !== "UserContent") {
+                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                    parentNode = parentNode.parentNode;
+                }
+
+                // This is always the top container which is now hardcoded to body
+                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
+            } else {
+                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
+                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                    parentNode = parentNode.parentNode;
+                }
+
+                // This is always the top container which is now hardcoded to body
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                parentNode = parentNode.parentNode;
+                console.log("this works!");
             }
 
-            // This is always the top container which is now hardcoded to body
-            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-
-
-
         }
     },
 
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 98442164..d9c35dc2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/