20 files changed, 153 insertions, 214 deletions
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 d9c35dc2..e7aaf0e8 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
        <script type="text/montage-serialization">
        {
            "strokeSizeHT": {
-                "module": "js/components/hottextunit.reel",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
-                "name": "HotTextUnit",
                "properties": {
                    "element": {"#": "strokeSize"},
                    "minValue": 1,
@@ -25,8 +24,7 @@
            },
            "strokeHardnessHT": {
-                "module": "js/components/hottextunit.reel",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
-                "name": "HotTextUnit",
                "properties": {
                    "element": {"#": "strokeHardness"},
                    "minValue": 0,
@@ -39,8 +37,7 @@
            },
            "strokeAngleHT": {
-                "module": "js/components/hottextunit.reel",
+                "prototype": "js/components/hottextunit.reel[HotTextUnit]",
-                "name": "HotTextUnit",
                "properties": {
                    "element": {"#": "strokeAngle"},
                    "minValue": -90,
@@ -53,8 +50,7 @@
            },
            "smoothingAmountHT": {
-                "module": "js/components/hottext.reel",
+                "prototype": "js/components/hottext.reel[HotText]",
-                "name": "HotText",
                "properties": {
                    "element": {"#": "smoothingAmount"},
                    "minValue": 0,
@@ -65,8 +61,7 @@
            },
            "owner": {
-                "module": "js/components/tools-properties/brush-properties.reel",
+                "prototype": "js/components/tools-properties/brush-properties.reel",
-                "name": "BrushProperties",
                "properties": {
                    "element": {"#": "brushProperties"},
                    "_strokeSize": {"@": "strokeSizeHT"},
@@ -85,16 +80,16 @@
    <body>
        <div data-montage-id="brushProperties" class="subToolHolderPanel">
-            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
+            <div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
                <label class="label"> Width:</label>
-                <div id="strokeSize" class="label"></div>
+                <div data-montage-id="strokeSize" class="label"></div>
                <label class="label"> Hardness:</label>
-                <div id="strokeHardness" class="label"></div>
+                <div data-montage-id="strokeHardness" class="label"></div>
                <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
-                <div id="smoothingAmount" class="label"></div>
+                <div data-montage-id="smoothingAmount" class="label"></div>
                <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
                <label class="label" id="angleLabel"> Angle:</label>
-                <div id="strokeAngle" class="label"></div>
+                <div data-montage-id="strokeAngle" class="label"></div>
            </div>
        </div>
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index f6a58a10..c13f5d65 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
        {
            "owner": {
-                "module": "js/components/tools-properties/eraser-properties.reel",
+                "prototype": "js/components/tools-properties/eraser-properties.reel",
-                "name": "EraserProperties",
                "properties": {
                    "element": {"#": "eraserProperties"}
                }
@@ -25,7 +24,7 @@
    </head>
    <body>
-        <div id="eraserProperties" class="subToolHolderPanel">
+        <div data-montage-id="eraserProperties" class="subToolHolderPanel">
        </div>
    </body>
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 3718c5c5..6f420673 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
        {
            "owner": {
-                "module": "js/components/tools-properties/eyedropper-properties.reel",
+                "prototype": "js/components/tools-properties/eyedropper-properties.reel",
-                "name": "EyedropperProperties",
                "properties": {
                    "element": {"#": "eyedropperProperties"}
                }
@@ -25,7 +24,7 @@
    </head>