21 files changed, 253 insertions, 163 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..b0c02734 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"},
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..7585bbb4 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"}
                }
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..1cde7a3e 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"}
                }
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index a35f9b15..b81b09ba 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-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">
        {
            "_fillMaterialCB": {
-                "module": "js/components/combobox.reel",
+                "prototype": "js/components/combobox.reel",
-                "name": "Combobox",
                "properties": {
                    "element": {"#": "fillMaterialCB"},
                    "labelField": "_name",
@@ -21,8 +20,7 @@
                }
            },
            "owner": {
-                "module": "js/components/tools-properties/fill-properties.reel",
+                "prototype": "js/components/tools-properties/fill-properties.reel",
-                "name": "FillProperties",
                "properties": {
                    "element": {"#": "fillProperties"},
                    "_useWebGL": {"#": "useWebGLCH"},
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
index 7f1b0f7f..a926a0b4 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
@@ -4,3 +4,27 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */