3 files changed, 241 insertions, 153 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 2eb608d3..6aa61812 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,31 +5,33 @@
  </copyright> */
 
 .optionsTextTool {
-    display: -webkit-box;
-    -webkit-box-orient:horizontal;
-    -webkit-box-align: stretch;
-    padding: 5px;
+    padding: 6px;
 }
 
-
-.optionsTextTool > * {
-    -webkit-box-flex:0;
+.optionsTextTool .btnGroup {
+    padding: 0px 8px;
 }
 
-.optionsTextTool .button {
-    width: auto;
-
+.optionsTextTool > *, .optionsTextTool .btnGroup > * {
+    float:left;
 }
 
-.optionsTextTool .hottextunit {
-    padding-top:5px;
+.optionsTextTool button {
+    width: auto;
+    padding: 4px 8px !important;
+    margin-left:4px;
 }
 
 .optionsTextTool .label, .optionsTextTool .hottextunit {
-    float:none;
     font-size:11px;
 }
 
 .optionsTextTool .fontSelection {
     width:100px;
+}
+
+.optionsTextTool .fontColor {
+    width: 20px;
+    height: 18px;
+    margin: 2px 6px;
 }
\ No newline at end of file
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 14123b12..7ded1236 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -77,41 +77,30 @@
             },
 
             "fontSize": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "module": "js/components/combobox.reel",
+                "name": "Combobox",
                 "properties": {
                     "element": {"#": "fontSize"},
-                    "value": 12,
                     "identifier": "fontSize"
                 },
                 "listeners": [
                     {
                         "type": "change",
                         "listener": {"@": "owner"}
-                    },
-                    {
-                        "type": "changing",
-                        "listener": {"@": "owner"}
                     }
                 ]
 
             },
-
-          "fontColor": {
-               "module" : "js/components/ui/color-chip.reel",
-               "name" : "ColorChip",
-               "properties" : {
-                   "element" : {"#": "fontColor"},
-                   "mode": "chip"
-               }
-           },
+        
             "btnBold": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnBold"},
-                    "_isToggleButton": true,
-                    "identifier": "btnBold"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnBold",
+                    "label": "B"
                 },
                 "listeners": [
                     {
@@ -121,12 +110,14 @@
                 ]
             },
             "btnItalic": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnItalic"},
-                    "_isToggleButton": true,
-                    "identifier": "btnItalic"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnItalic",
+                    "label": "I"
                 },
                 "listeners": [
                     {
@@ -136,12 +127,14 @@
                 ]
             },
             "btnUnderline": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnUnderline"},
-                    "_isToggleButton": true,
-                    "identifier": "btnUnderline"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnUnderline",
+                    "label": "U"
                 },
                 "listeners": [
                     {
@@ -151,12 +144,14 @@
                 ]
             },
             "btnStrikethrough": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnStrikethrough"},
-                    "_isToggleButton": true,
-                    "identifier": "btnStrikethrough"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnStrikethrough",
+                    "label": "S"
                 },
                 "listeners": [
                     {
@@ -165,28 +160,16 @@
                     }
                 ]
             },
-            "txtLink": {
-                "module": "js/components/textfield.reel",
-                "name": "TextField",
-                "properties": {
-                    "element": {"#": "txtLink"}
-                }
-            },
-            "linkTarget": {
-                "module": "js/components/combobox.reel",
-                "name": "Combobox",
-                "properties": {
+