16 files changed, 134 insertions, 72 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 2c91ca13..4448e1f1 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "codeComplete"}
             },
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 ca447b8b..cf68520f 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useFillColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useFillColor"},
                     "identifier": "useFillColor",
@@ -21,7 +21,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 5620eed8..579930f0 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useStrokeColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeColor"},
                     "identifier": "useStrokeColor",
@@ -21,7 +21,7 @@
             },
 
             "useBorderWidth": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderWidth"},
                     "identifier": "useBorderWidth",
@@ -49,7 +49,7 @@
             },
 
             "useBorderStyle": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderStyle"},
                     "identifier": "useBorderStyle",
@@ -65,7 +65,7 @@
             },
 
             "useStrokeSize": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeSize"},
                     "identifier": "useStrokeSize",
@@ -94,7 +94,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html
index 0efc7ae0..d39fca9b 100755
--- a/js/components/ui/label-checkbox.reel/label-checkbox.html
+++ b/js/components/ui/label-checkbox.reel/label-checkbox.html
@@ -20,7 +20,7 @@
         },
 
         "checkbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "checkbox"},
                 "checked": false
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index fb108937..2e91b479 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index c3209654..ff165f9a 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -12,7 +12,7 @@
     {
 
         "newFileDirectory": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileDirectory"}
             }
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index f9a42887..0c410a47 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -56,7 +56,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index dcdb073f..99f98ddb 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -18,7 +18,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }
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..52d8b830 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/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "disable-checkbox"},
                     "checked": true
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index a737bd39..9fa24e15 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -11,21 +11,21 @@
         <script type="text/montage-serialization">