7 files changed, 11 insertions, 14 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 5937b58f..80fd1a13 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -6,6 +6,8 @@
 </copyright> -->
 <html lang="en">
 <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    
    <script type="text/montage-serialization">
        {
            "Resizer": {
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index e6b7a6e3..46f91410 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -98,11 +98,6 @@ exports.ComponentsPanel = Montage.create(Component, {
                            "text": "Textfield",
                            "dataFile" : "node_modules/components-data/textfield.json",
                            "component": "textfield"
-                        },
-                        {
-                            "text": "Toggle Button",
-                            "dataFile" : "node_modules/components-data/toggle-button.json",
-                            "component": "toggleButton"
                        }
                    ]
                }
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html
index 0f16b3d8..4e670cdc 100644
--- a/js/panels/css-panel/css-style.reel/css-style.html
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -24,7 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                "object": "js/panels/CSSPanel/css-property-name-list"
            },
            "checkbox": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/native/input-checkbox.reel",
                "properties": {
                    "element": {"#": "disable-checkbox"},
                    "checked": true
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
index 8b0c3101..99021917 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -49,7 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                }
            },
            "sheetLink": {
-                "prototype": "montage/ui/anchor.reel",
+                "prototype": "montage/ui/native/anchor.reel",
                "properties": {
                    "element": {"#": "style-sheet-name"}
                }
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index d08453fa..4f17c0fb 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -40,7 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                }
            },
            "editButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                "properties": {
                    "element": {"#": "edit-button"},
                    "identifier": "editButton",
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
            },
            "disableButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                "properties": {
                    "element": {"#": "disable-button"},
                    "identifier": "disableButton",
@@ -66,7 +66,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
            },
            "deleteButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                "properties": {
                    "element": {"#": "delete-button"},
                    "identifier": "deleteButton",
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index a737bd39..72984c17 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -11,21 +11,21 @@
        <script type="text/montage-serialization">
        {
            "elementName": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                "properties": {
                    "element": {"#": "elementName"}
                }
            },
            "elementId": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                "properties": {
                    "element": {"#": "elementId"}
                }
            },
            "elementClass": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                "properties": {
                    "element": {"#": "elementClass"}
                }
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 572e5a60..259e9ab5 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -232,7 +232,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
            }
        },
        "flattenCheckbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
            "properties": {
                "element": {"#": "flattenCh"},
                "identifier": "flatten",