diff --git a/fluentui/ControlTemplates.json b/fluentui/ControlTemplates.json
index 35ae0880a0a2f6fa1b5e92c6a28495d43b12b55a..335a84d9a2ddd72306bc6340cf4411861b1dae75 100644
--- a/fluentui/ControlTemplates.json
+++ b/fluentui/ControlTemplates.json
@@ -94,20 +94,6 @@
     "OverridableProperties": {},
     "Version": "2.5.1"
   },
-  "octagon": {
-    "CustomGroupControlTemplateName": "",
-    "FirstParty": true,
-    "Id": "http://microsoft.com/appmagic/shapes/octagon",
-    "IsComponentTemplate": false,
-    "IsCustomGroupControlTemplate": false,
-    "IsPcfControl": false,
-    "IsPremiumPcfControl": false,
-    "IsWidgetTemplate": true,
-    "LastModifiedTimestamp": "0",
-    "Name": "octagon",
-    "OverridableProperties": {},
-    "Version": "2.3.0"
-  },
   "screen": {
     "CustomGroupControlTemplateName": "",
     "FirstParty": true,
diff --git a/fluentui/Entropy/AppCheckerResult.sarif b/fluentui/Entropy/AppCheckerResult.sarif
index 48048b0aa731cbd757ec95415042b9936877c0e3..d7383fec3f004256a5b291ba1d24b2799c6f02a4 100644
--- a/fluentui/Entropy/AppCheckerResult.sarif
+++ b/fluentui/Entropy/AppCheckerResult.sarif
@@ -14,19 +14,19 @@
             {
               "logicalLocations": [
                 {
-                  "fullyQualifiedName": "Main.tab1.AccessibleLabel"
+                  "fullyQualifiedName": "Main.chatbox1.AccessibleLabel"
                 }
               ],
               "physicalLocation": {
                 "address": {
-                  "fullyQualifiedName": "Main.tab1.AccessibleLabel",
+                  "fullyQualifiedName": "Main.chatbox1.AccessibleLabel",
                   "relativeAddress": 0
                 }
               },
               "properties": {
                 "member": "AccessibleLabel",
                 "module": "Main",
-                "type": "Main.tab1"
+                "type": "Main.chatbox1"
               }
             }
           ],
@@ -39,36 +39,6 @@
           "ruleId": "acc-AccessibleLabelNeeded",
           "ruleIndex": 0
         },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Main.tab1.TabIndex"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Main.tab1.TabIndex",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "TabIndex",
-                "module": "Main",
-                "type": "Main.tab1"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Low"
-          },
-          "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
-        },
         {
           "locations": [
             {
diff --git a/fluentui/Entropy/Entropy.json b/fluentui/Entropy/Entropy.json
index 5fc124ec0c0942b8f9ac1566f565405a2c40cb43..c3aea4343254e05cd655716cfb456eab305933b0 100644
--- a/fluentui/Entropy/Entropy.json
+++ b/fluentui/Entropy/Entropy.json
@@ -3,26 +3,21 @@
   "ControlUniqueGuids": {},
   "ControlUniqueIds": {
     "App": 1,
-    "chatbox1": 10,
+    "chatbox1": 19,
     "completionmode": 16,
     "Dropdown1": 6,
     "Eraser1": 15,
     "Host": 3,
     "Label7": 13,
     "Main": 4,
-    "Octagon1": 8,
-    "Octagon1_1": 9,
-    "Octagon1_2": 11,
-    "Octagon1_3": 12,
     "rbblogo": 7,
     "send1": 18,
     "SendMail1": 14,
-    "tab1": 5,
     "textinput1": 17
   },
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "11/14/2023 13:38:04",
+  "HeaderLastSavedDateTimeUTC": "11/14/2023 13:50:20",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "99352d8f-567f-4bcc-a2d7-87a89a789722": "\"/providers/microsoft.powerapps/apis/shared_logicflows/connections/38d6e5b5b5fa999a16ebdf0aa169572f-c1654a69e558fc9f\"",
@@ -48,12 +43,11 @@
   "OrderPcfTemplate": {},
   "OrderTemplate": {},
   "OrderXMLTemplate": {
-    "dropdown": 1,
-    "icon": 0,
-    "image": 2,
-    "label": 4,
-    "octagon": 3,
-    "text": 6,
+    "dropdown": 0,
+    "icon": 4,
+    "image": 1,
+    "label": 3,
+    "text": 2,
     "toggleSwitch": 5
   },
   "OverridablePropertiesEntry": {
@@ -65,36 +59,26 @@
     "Host": {},
     "Label7": {},
     "Main": {},
-    "Octagon1": {},
-    "Octagon1_1": {},
-    "Octagon1_2": {},
-    "Octagon1_3": {},
     "rbblogo": {},
     "send1": {},
     "SendMail1": {},
-    "tab1": {},
     "textinput1": {}
   },
   "PCFDynamicSchemaForIRRetrievalEntry": {},
   "PCFTemplateEntry": {},
   "PublishOrderIndices": {
     "App": 0,
-    "chatbox1": 5,
-    "completionmode": 11,
-    "Dropdown1": 1,
-    "Eraser1": 10,
+    "chatbox1": 2,
+    "completionmode": 6,
+    "Dropdown1": 0,
+    "Eraser1": 5,
     "Host": 0,
-    "Label7": 8,
+    "Label7": 3,
     "Main": 0,
-    "Octagon1": 3,
-    "Octagon1_1": 4,
-    "Octagon1_2": 6,
-    "Octagon1_3": 7,
-    "rbblogo": 2,
-    "send1": 13,
-    "SendMail1": 9,
-    "tab1": 0,
-    "textinput1": 12
+    "rbblogo": 1,
+    "send1": 8,
+    "SendMail1": 4,
+    "textinput1": 7
   },
   "ResourcesJsonIndices": {
     "Image-rbb-logo": 1,
@@ -111,7 +95,7 @@
       "label": 2,
       "octagon": 4,
       "screen": 1,
-      "text": 1,
+      "text": 2,
       "toggleSwitch": 1
     },
     "DeserializationLoadTime": 1.1984149
diff --git a/fluentui/Entropy/checksum.json b/fluentui/Entropy/checksum.json
index 12b623fd2f7e8d09e5bf52bd5b7bc9f74cbb0320..ff3c8cb981367b55a68c79dc26d57fb959e428a9 100644
--- a/fluentui/Entropy/checksum.json
+++ b/fluentui/Entropy/checksum.json
@@ -4,35 +4,35 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_gY+oRWV+oCXcq1RkD+PenJW8UBaa2H6I1rwOeikjJjA=",
+    "AppCheckerResult.sarif": "C8_fEVQ+soVrCSavFqHDdl+QmXx0YXOmDTFtjfBfGuTucU=",
     "Assets\\Images\\c78fd8d6-7fd4-4a19-9148-12889f1d10c9.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_opQhFd7tQ3IkRABVgFFq82IYQKAFbJ5qy/GElyH/FyI=",
-    "Controls\\4.json": "C8_0Tok6gYvMivzZE8lCwQbIjm7UUvEbYpODEIFm+ols7Q=",
-    "Header.json": "C8_GuxywiHRhU/MB5kLbf37Q3bn/SJpeLupsL5f1MkHqek=",
-    "Properties.json": "C8_ZkHnpa4biTh9rQsniPRvboR++k/u1ND21epSK2+YaiM=",
+    "Controls\\4.json": "C8_phfVk9hbsBKTZ7B0F6BTyLnJaUC0euccZFW66/gUYeU=",
+    "Header.json": "C8_f0U5/x4THjaxt8K0ASaNVNlDCBmCPIPew0FG10SO05Y=",
+    "Properties.json": "C8_t3cSnhL0YNgB5YKFGhdBdhiIuid0lY7nuLFtCLlgVpc=",
     "References\\DataSources.json": "C8_l4/JWdS5LzsAapgpFFlYHhNyBsBaeSUj2f88rHt3dog=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_TehFuiha1lpvm96o4utagiOYJdZJBVJagZfxSpOhobs=",
-    "References\\Templates.json": "C8_bI6XWbCD4koCtbRRx5qIiWo2xPuUy6VV58+x67Jpmnw=",
+    "References\\Templates.json": "C8_AzmicLxRMwZS3q6fD4bAGyWv4pZVGVI0XKX0YOxIX6g=",
     "References\\Themes.json": "C8_tsXtDVkT5pjhDU/pIa1ap3UW1Mua31Be8aPLGOt6H94=",
     "Resources\\dbucp5e3.jpg": "C8_2LEwJZMhrD5m6xki6L+aGapXwTRKzCree1HX8l46rss=",
     "Resources\\PublishInfo.json": "C8_bks7wnKsxkFad74B2uHcDqv0O4q9QcoIWSENafrbcDQ="
   },
-  "ClientStampedChecksum": "C8_47uHq8h+d42Evn2LXIAhkuVmuqCaV5swDA2ubJ9ZzvM=",
+  "ClientStampedChecksum": "C8_Fap0uOU7KG856HBWAbs/ncv3P8jZGlXVW2ISp4iC9/o=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_gY+oRWV+oCXcq1RkD+PenJW8UBaa2H6I1rwOeikjJjA=",
+    "AppCheckerResult.sarif": "C8_fEVQ+soVrCSavFqHDdl+QmXx0YXOmDTFtjfBfGuTucU=",
     "Assets\\Images\\c78fd8d6-7fd4-4a19-9148-12889f1d10c9.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_opQhFd7tQ3IkRABVgFFq82IYQKAFbJ5qy/GElyH/FyI=",
-    "Controls\\4.json": "C8_0Tok6gYvMivzZE8lCwQbIjm7UUvEbYpODEIFm+ols7Q=",
-    "Header.json": "C8_GuxywiHRhU/MB5kLbf37Q3bn/SJpeLupsL5f1MkHqek=",
-    "Properties.json": "C8_ZkHnpa4biTh9rQsniPRvboR++k/u1ND21epSK2+YaiM=",
+    "Controls\\4.json": "C8_phfVk9hbsBKTZ7B0F6BTyLnJaUC0euccZFW66/gUYeU=",
+    "Header.json": "C8_f0U5/x4THjaxt8K0ASaNVNlDCBmCPIPew0FG10SO05Y=",
+    "Properties.json": "C8_t3cSnhL0YNgB5YKFGhdBdhiIuid0lY7nuLFtCLlgVpc=",
     "References\\DataSources.json": "C8_l4/JWdS5LzsAapgpFFlYHhNyBsBaeSUj2f88rHt3dog=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_TehFuiha1lpvm96o4utagiOYJdZJBVJagZfxSpOhobs=",
-    "References\\Templates.json": "C8_bI6XWbCD4koCtbRRx5qIiWo2xPuUy6VV58+x67Jpmnw=",
+    "References\\Templates.json": "C8_AzmicLxRMwZS3q6fD4bAGyWv4pZVGVI0XKX0YOxIX6g=",
     "References\\Themes.json": "C8_tsXtDVkT5pjhDU/pIa1ap3UW1Mua31Be8aPLGOt6H94=",
     "Resources\\dbucp5e3.jpg": "C8_2LEwJZMhrD5m6xki6L+aGapXwTRKzCree1HX8l46rss=",
     "Resources\\PublishInfo.json": "C8_bks7wnKsxkFad74B2uHcDqv0O4q9QcoIWSENafrbcDQ="
   },
-  "ServerStampedChecksum": "C8_47uHq8h+d42Evn2LXIAhkuVmuqCaV5swDA2ubJ9ZzvM="
+  "ServerStampedChecksum": "C8_Fap0uOU7KG856HBWAbs/ncv3P8jZGlXVW2ISp4iC9/o="
 }
\ No newline at end of file
diff --git a/fluentui/Src/EditorState/Main.editorstate.json b/fluentui/Src/EditorState/Main.editorstate.json
index 08c10938a10e7653096b58e7e43f8622640365f6..57574689acc3998f498dd52702b97fe555205f2f 100644
--- a/fluentui/Src/EditorState/Main.editorstate.json
+++ b/fluentui/Src/EditorState/Main.editorstate.json
@@ -3,21 +3,25 @@
     "chatbox1": {
       "AllowAccessToGlobals": true,
       "ControlPropertyState": [
-        "Live",
-        "Overflow",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "\"Text\"",
-          "InvariantPropertyName": "Text",
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Default",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "Role",
-        "Color",
-        "DisabledColor",
-        "PressedColor",
-        "HoverColor",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Mode",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        "Format",
+        "VirtualKeyboardMode",
+        "DelayOutput",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
@@ -26,23 +30,19 @@
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "DisabledBorderColor",
-        "PressedBorderColor",
-        "HoverBorderColor",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "BorderStyle",
+          "InvariantPropertyName": "DisabledBorderColor",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "FocusedBorderColor",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
+          "InvariantPropertyName": "PressedBorderColor",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
@@ -50,19 +50,27 @@
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "DisabledFill",
+          "InvariantPropertyName": "HoverBorderColor",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "PressedFill",
-        "HoverFill",
-        "Font",
-        "FontWeight",
+        "BorderStyle",
+        "FocusedBorderColor",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Align",
+          "InvariantPropertyName": "Color",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        "DisabledColor",
+        "PressedColor",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "HoverColor",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
@@ -70,30 +78,58 @@
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "VerticalAlign",
+          "InvariantPropertyName": "Fill",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
+        "DisabledFill",
+        "PressedFill",
+        "HoverFill",
+        "Font",
+        "FontWeight",
+        "Align",
         "X",
         "Y",
         "Width",
         "Height",
-        "DisplayMode",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "DisplayMode.Edit",
+          "InvariantPropertyName": "DisplayMode",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         "ZIndex",
-        "LineHeight",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "BorderThickness",
+          "AutoRuleBindingString": "0",
+          "InvariantPropertyName": "RadiusTopLeft",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "FocusedBorderThickness",
+          "AutoRuleBindingString": "0",
+          "InvariantPropertyName": "RadiusTopRight",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "0",
+          "InvariantPropertyName": "RadiusBottomLeft",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "0",
+          "InvariantPropertyName": "RadiusBottomRight",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
@@ -101,29 +137,60 @@
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Size",
+          "InvariantPropertyName": "BorderThickness",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
+        "FocusedBorderThickness",
+        "Size",
         "Italic",
         "Underline",
         "Strikethrough",
-        "PaddingTop",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "false",
+          "InvariantPropertyName": "EnableSpellCheck",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "PaddingRight",
+          "InvariantPropertyName": "Clear",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "false",
+          "InvariantPropertyName": "Reset",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "false",
+          "InvariantPropertyName": "OnSelect",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "false",
+          "InvariantPropertyName": "OnChange",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "PaddingBottom",
-        "PaddingLeft",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "TabIndex",
+          "InvariantPropertyName": "MaxLength",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         }
@@ -138,112 +205,117 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "chatbox1",
-      "ParentIndex": 5,
+      "ParentIndex": 2,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
           "Category": "Data",
-          "PropertyName": "Role",
+          "PropertyName": "Default",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Data",
-          "PropertyName": "Text",
+          "PropertyName": "Reset",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Data",
-          "PropertyName": "Live",
+          "PropertyName": "MaxLength",
+          "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Data",
+          "PropertyName": "DelayOutput",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Size",
+          "PropertyName": "Mode",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
+          "PropertyName": "Format",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "BorderThickness",
+          "PropertyName": "VirtualKeyboardMode",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "LineHeight",
+          "PropertyName": "BorderColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "ZIndex",
+          "PropertyName": "DisabledBorderColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "DisplayMode",
+          "PropertyName": "PressedBorderColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PaddingLeft",
+          "PropertyName": "HoverBorderColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PaddingBottom",
+          "PropertyName": "BorderStyle",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Height",
+          "PropertyName": "Color",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Width",
+          "PropertyName": "DisabledColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PaddingRight",
+          "PropertyName": "PressedColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PaddingTop",
+          "PropertyName": "HoverColor",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Y",
+          "PropertyName": "Fill",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Strikethrough",
+          "PropertyName": "DisabledFill",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "X",
+          "PropertyName": "PressedFill",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "VerticalAlign",
+          "PropertyName": "HoverFill",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Underline",
+          "PropertyName": "Font",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Italic",
+          "PropertyName": "FontWeight",
           "RuleProviderType": "Unknown"
         },
         {
@@ -253,96 +325,111 @@
         },
         {
           "Category": "Design",
-          "PropertyName": "FontWeight",
+          "PropertyName": "X",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Font",
+          "PropertyName": "Y",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "DisabledFill",
+          "PropertyName": "Width",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Fill",
+          "PropertyName": "Height",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "BorderStyle",
+          "PropertyName": "DisplayMode",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "DisabledBorderColor",
+          "PropertyName": "ZIndex",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "BorderColor",
+          "PropertyName": "EnableSpellCheck",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "DisabledColor",
+          "PropertyName": "RadiusTopLeft",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Color",
+          "PropertyName": "RadiusTopRight",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "Overflow",
+          "PropertyName": "RadiusBottomLeft",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "HoverFill",
+          "PropertyName": "RadiusBottomRight",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PressedFill",
+          "PropertyName": "BorderThickness",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
+          "PropertyName": "FocusedBorderThickness",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "HoverBorderColor",
+          "PropertyName": "Size",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PressedBorderColor",
+          "PropertyName": "Italic",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "HoverColor",
+          "PropertyName": "Underline",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "PressedColor",
+          "PropertyName": "Strikethrough",
           "RuleProviderType": "Unknown"
         },
         {
           "Category": "Design",
-          "PropertyName": "TabIndex",
+          "PropertyName": "Clear",
+          "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Design",
+          "PropertyName": "FocusedBorderColor",
+          "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Behavior",
+          "PropertyName": "OnChange",
+          "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Behavior",
+          "PropertyName": "OnSelect",
           "RuleProviderType": "Unknown"
         }
       ],
-      "StyleName": "defaultLabelStyle",
+      "StyleName": "defaultTextStyle",
       "Type": "ControlInfo"
     },
     "completionmode": {
@@ -456,7 +543,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "completionmode",
-      "ParentIndex": 11,
+      "ParentIndex": 6,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -796,7 +883,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Dropdown1",
-      "ParentIndex": 1,
+      "ParentIndex": 0,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -1112,7 +1199,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Eraser1",
-      "ParentIndex": 10,
+      "ParentIndex": 5,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -1325,7 +1412,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "Label7",
-      "ParentIndex": 8,
+      "ParentIndex": 3,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -1628,609 +1715,25 @@
       "StyleName": "defaultScreenStyle",
       "Type": "ControlInfo"
     },
-    "Octagon1": {
+    "rbblogo": {
       "AllowAccessToGlobals": true,
       "ControlPropertyState": [
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
+          "AutoRuleBindingString": "SampleImage",
+          "InvariantPropertyName": "Image",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "BorderColor",
-        "BorderStyle",
-        "FocusedBorderColor",
-        "DisplayMode",
+        "ImagePosition",
+        "ImageRotation",
+        "X",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "",
-          "InvariantPropertyName": "X",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Y",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Width",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Height",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness"
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "Octagon1",
-      "ParentIndex": 3,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultOctagonStyle",
-      "Type": "ControlInfo"
-    },
-    "Octagon1_1": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "BorderColor",
-        "BorderStyle",
-        "FocusedBorderColor",
-        "DisplayMode",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "X",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Y",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Width",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Height",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness"
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "Octagon1_1",
-      "ParentIndex": 4,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultOctagonStyle",
-      "Type": "ControlInfo"
-    },
-    "Octagon1_2": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "BorderColor",
-        "BorderStyle",
-        "FocusedBorderColor",
-        "DisplayMode",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "X",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Y",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Width",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Height",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness"
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "Octagon1_2",
-      "ParentIndex": 6,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultOctagonStyle",
-      "Type": "ControlInfo"
-    },
-    "Octagon1_3": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "BorderColor",
-        "BorderStyle",
-        "FocusedBorderColor",
-        "DisplayMode",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "X",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Y",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Width",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Height",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness"
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "Octagon1_3",
-      "ParentIndex": 7,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultOctagonStyle",
-      "Type": "ControlInfo"
-    },
-    "rbblogo": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "SampleImage",
-          "InvariantPropertyName": "Image",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "ImagePosition",
-        "ImageRotation",
-        "X",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Y",
+          "InvariantPropertyName": "Y",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
@@ -2269,7 +1772,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "rbblogo",
-      "ParentIndex": 2,
+      "ParentIndex": 1,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2511,7 +2014,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "send1",
-      "ParentIndex": 13,
+      "ParentIndex": 8,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2748,7 +2251,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "SendMail1",
-      "ParentIndex": 9,
+      "ParentIndex": 4,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
@@ -2880,239 +2383,6 @@
       "StyleName": "defaultIconStyle",
       "Type": "ControlInfo"
     },
-    "tab1": {
-      "AllowAccessToGlobals": true,
-      "ControlPropertyState": [
-        "Icon",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Color",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledColor",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "RGBA(16, 110, 190, 1)",
-          "InvariantPropertyName": "PressedColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "HoverColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "Fill",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "DisabledFill",
-        "PressedFill",
-        "HoverFill",
-        "DisplayMode",
-        "X",
-        "Y",
-        "Width",
-        "Height",
-        "BorderStyle",
-        "BorderColor",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "DisabledBorderColor",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        "PressedBorderColor",
-        "HoverBorderColor",
-        "FocusedBorderColor",
-        "ZIndex",
-        "BorderThickness",
-        "FocusedBorderThickness",
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "AutoDisableOnSelect",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "",
-          "InvariantPropertyName": "TabIndex",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        },
-        {
-          "AFDDataSourceName": "",
-          "AutoRuleBindingEnabled": false,
-          "AutoRuleBindingString": "false",
-          "InvariantPropertyName": "OnSelect",
-          "IsLockable": false,
-          "NameMapSourceSchema": "?"
-        }
-      ],
-      "HasDynamicProperties": false,
-      "IsAutoGenerated": false,
-      "IsComponentDefinition": false,
-      "IsDataControl": false,
-      "IsFromScreenLayout": false,
-      "IsGroupControl": false,
-      "IsLocked": false,
-      "LayoutName": "",
-      "MetaDataIDKey": "",
-      "Name": "tab1",
-      "ParentIndex": 0,
-      "PersistMetaDataIDKey": false,
-      "Properties": [
-        {
-          "Category": "Design",
-          "PropertyName": "BorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "ZIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "BorderStyle",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Height",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Width",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Y",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "X",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisplayMode",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledFill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Fill",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "HoverColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "PressedColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "DisabledColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderThickness",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Color",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "Icon",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "FocusedBorderColor",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "AutoDisableOnSelect",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Design",
-          "PropertyName": "TabIndex",
-          "RuleProviderType": "Unknown"
-        },
-        {
-          "Category": "Behavior",
-          "PropertyName": "OnSelect",
-          "RuleProviderType": "Unknown"
-        }
-      ],
-      "StyleName": "defaultIconStyle",
-      "Type": "ControlInfo"
-    },
     "textinput1": {
       "AllowAccessToGlobals": true,
       "ControlPropertyState": [
@@ -3311,7 +2581,7 @@
       "LayoutName": "",
       "MetaDataIDKey": "",
       "Name": "textinput1",
-      "ParentIndex": 12,
+      "ParentIndex": 7,
       "PersistMetaDataIDKey": false,
       "Properties": [
         {
diff --git a/fluentui/Src/Main.fx.yaml b/fluentui/Src/Main.fx.yaml
index d864f7b3fe2fb6ffd7cdd3025f5c5802163581f5..1402134e5ba85b2a5c972708b8c63b0c5c8628ce 100644
--- a/fluentui/Src/Main.fx.yaml
+++ b/fluentui/Src/Main.fx.yaml
@@ -64,45 +64,6 @@ Main As screen:
         Y: =1021
         ZIndex: =2
 
-    chatbox1 As label:
-        Align: =Align.Justify
-        BorderColor: =RGBA(224, 24, 24, 1)
-        Color: =RGBA(50, 49, 48, 1)
-        DisabledBorderColor: =RGBA(0, 0, 0, 0)
-        DisabledColor: =RGBA(161, 159, 157, 1)
-        DisabledFill: =RGBA(204, 204, 204, 1)
-        Fill: =RGBA(230, 230, 230, 1)
-        Font: =Font.'Segoe UI'
-        Height: =781
-        Size: =32
-        Text: =varResponse
-        VerticalAlign: =VerticalAlign.Bottom
-        Width: =560
-        X: =40
-        Y: =94
-        ZIndex: =3
-
-    tab1 As icon.Bookmark:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        Color: =RGBA(224, 24, 24, 1)
-        DisabledBorderColor: =RGBA(0, 0, 0, 0)
-        DisabledColor: =RGBA(225, 223, 221, 1)
-        DisabledFill: =RGBA(0, 0, 0, 0)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        HoverBorderColor: =RGBA(0, 0, 0, 0)
-        HoverColor: =RGBA(251, 188, 159, 1)
-        HoverFill: =RGBA(0, 0, 0, 0)
-        Icon: =Icon.Bookmark
-        OnSelect: |-
-            =//If(IsBlank(chatbox1.Text) = false, Set(varResponseTab1,varResponse) && Select(Eraser1));
-            //If(IsBlank(chatbox1.Text) = true, Set(varResponse,varResponseTab1));
-        PressedBorderColor: =RGBA(0, 0, 0, 0)
-        PressedColor: =RGBA(255, 255, 255, 1)
-        PressedFill: =RGBA(0, 0, 0, 0)
-        TabIndex: =6
-        ZIndex: =4
-
     SendMail1 As icon.Mail:
         BorderColor: =RGBA(0, 0, 0, 0)
         Color: =RGBA(255, 255, 255, 1)
@@ -240,63 +201,38 @@ Main As screen:
         Y: =907
         ZIndex: =15
 
-    Octagon1 As octagon:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        BorderStyle: =BorderStyle.None
-        BorderThickness: =2
-        DisabledFill: =RGBA(225, 223, 221, 1)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        Height: =55
-        HoverFill: =RGBA(0, 120, 212, 1)
-        PressedFill: =RGBA(0, 120, 212, 1)
-        Width: =55
-        X: =1
-        Y: =55
-        ZIndex: =16
-
-    Octagon1_1 As octagon:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        BorderStyle: =BorderStyle.None
-        BorderThickness: =2
-        DisabledFill: =RGBA(225, 223, 221, 1)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        Height: =55
-        HoverFill: =RGBA(0, 120, 212, 1)
-        PressedFill: =RGBA(0, 120, 212, 1)
-        Width: =55
-        X: =584
-        Y: =55
-        ZIndex: =17
-
-    Octagon1_2 As octagon:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        BorderStyle: =BorderStyle.None
-        BorderThickness: =2
-        DisabledFill: =RGBA(225, 223, 221, 1)
-        Fill: =RGBA(224, 24, 24, 1)
-        FocusedBorderThickness: =4
-        Height: =55
-        HoverFill: =RGBA(0, 120, 212, 1)
-        PressedFill: =RGBA(0, 120, 212, 1)
-        Width: =55
-        X: =1
-        Y: =859
-        ZIndex: =18
-
-    Octagon1_3 As octagon:
-        BorderColor: =RGBA(0, 0, 0, 0)
-        BorderStyle: =BorderStyle.None
-        BorderThickness: =2
-        DisabledFill: =RGBA(225, 223, 221, 1)
-        Fill: =RGBA(224, 24, 24, 1)
+    chatbox1 As text:
+        BorderColor: =RGBA(224, 24, 24, 1)
+        BorderThickness: =0
+        Color: =RGBA(0, 0, 0, 1)
+        Default: =varResponse
+        DisabledBorderColor: =RGBA(0, 0, 0, 0)
+        DisabledColor: =RGBA(161, 159, 157, 1)
+        DisabledFill: =RGBA(242, 242, 241, 0)
+        DisplayMode: =DisplayMode.View
+        EnableSpellCheck: =true
+        Fill: =RGBA(236, 236, 235, 1)
         FocusedBorderThickness: =4
-        Height: =55
-        HoverFill: =RGBA(0, 120, 212, 1)
-        PressedFill: =RGBA(0, 120, 212, 1)
-        Width: =55
-        X: =584
-        Y: =859
-        ZIndex: =19
+        Font: =Font.'Segoe UI'
+        Height: =781
+        HoverBorderColor: =RGBA(255, 255, 255, 1)
+        HoverColor: =RGBA(0, 0, 0, 1)
+        HoverFill: =RGBA(255, 255, 255, 1)
+        MaxLength: =500
+        Mode: =TextMode.MultiLine
+        OnChange: =
+        OnSelect: =
+        PressedBorderColor: =RGBA(0, 0, 0, 0)
+        PressedColor: =RGBA(50, 49, 48, 1)
+        PressedFill: =RGBA(255, 255, 255, 1)
+        RadiusBottomLeft: =10
+        RadiusBottomRight: =10
+        RadiusTopLeft: =10
+        RadiusTopRight: =10
+        Reset: =
+        Size: =21
+        Width: =560
+        X: =40
+        Y: =94
+        ZIndex: =20
 
diff --git a/fluentui/pkgs/octagon_2.3.0.xml b/fluentui/pkgs/octagon_2.3.0.xml
deleted file mode 100644
index 2455562dd37dfe3c45d570dc052f9e5c9c32aff5..0000000000000000000000000000000000000000
--- a/fluentui/pkgs/octagon_2.3.0.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<widget xmlns="http://openajax.org/metadata" spec="1.0" id="http://microsoft.com/appmagic/shapes/octagon" name="octagon" jsClass="AppMagic.Controls.Shapes.Octagon" version="2.3.0" styleable="true" runtimeCost="1" xmlns:appMagic="http://schemas.microsoft.com/appMagic">
-  <author name="Microsoft AppMagic" />
-  <license type="text/html"><![CDATA[<p>TODO:  Need license text here.</p>]]></license>
-  <description><![CDATA[Octagon
-      Control description here.]]></description>
-  <requires>
-    <require type="css" src="/ctrllib/shapes/css/shape.css" />
-    <require type="javascript" src="/ctrllib/shapes/js/shape.js" />
-  </requires>
-  <appMagic:capabilities contextualViewsEnabled="true" autoPointerViewState="true" autoDisabledViewState="true" isVersionFlexible="true" />
-  <content><![CDATA[
-    <div class="appmagic-svg no-focus-outline" data-bind="
-      shortcut: {
-        provider: shortcutProvider,
-        capture: false
-      },
-      click: onClickHandler,
-      css: {
-        readonly: viewState.displayMode() !== AppMagic.Constants.DisplayMode.Edit
-      },
-      attr: {
-        title: properties.Tooltip() || null,
-        role: (properties.TabIndex() < 0) ? (!!properties.AccessibleLabel() && 'img') : 'button',
-        'aria-label': properties.AccessibleLabel() || null,
-        'aria-disabled': (properties.TabIndex() >= 0) && (viewState.displayMode() !== AppMagic.Constants.DisplayMode.Edit),
-        'aria-hidden': properties.TabIndex() < 0 && !properties.AccessibleLabel()
-      }">
-      <svg version="1.1" baseProfile="tiny" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg"
-        focusable="false"
-        aria-hidden="true"
-        touch-action="pan-x pan-y"
-        data-bind="
-          attr: {
-            preserveAspectRatio: properties.PreserveAspectRatio() ? 'xMidYMid meet' : 'none'
-          },
-          style: {
-            width: AppMagic.Controls.converters.pxHorizontalConverter.view(properties.Width()),
-            height: AppMagic.Controls.converters.pxVerticalConverter.view(properties.Height())
-          }">
-        <g>
-          <polygon data-bind="attr: {
-            fill: fill,
-            points: innerPoints
-          }" />
-
-          <!-- Border polygon -->
-          <polygon data-bind="attr: {
-            fill: 'transparent',
-            stroke: borderColor,
-            'stroke-width': borderThickness,
-            'stroke-dasharray': properties.BorderStyle,
-            points: outerPoints
-          }" />
-        </g>
-      </svg>
-    </div>
-    ]]></content>
-  <appMagic:includeProperties>
-    <appMagic:includeProperty name="AccessibleLabel" />
-    <appMagic:includeProperty name="Tooltip" />
-    <appMagic:includeProperty name="ContentLanguage" />
-    <appMagic:includeProperty name="Fill" defaultValue="RGBA(0, 176, 240, 1)" isPrimaryOutputProperty="true" />
-    <appMagic:includeProperty name="DisabledFill" defaultValue="Self.Fill" />
-    <appMagic:includeProperty name="PressedFill" defaultValue="Self.Fill" />
-    <appMagic:includeProperty name="HoverFill" defaultValue="Self.Fill" />
-    <appMagic:includeProperty name="BorderColor" defaultValue="RGBA(0, 0, 255, 1)" />
-    <appMagic:includeProperty name="BorderStyle" converter="strokeConverter" />
-    <appMagic:includeProperty name="BorderThickness" />
-    <appMagic:includeProperty name="FocusedBorderColor" defaultValue="Self.BorderColor" isExpr="true" />
-    <appMagic:includeProperty name="FocusedBorderThickness" />
-    <appMagic:includeProperty name="Visible" />
-    <appMagic:includeProperty name="DisplayMode" />
-    <appMagic:includeProperty name="TabIndex" defaultValue="-1" />
-    <appMagic:includeProperty name="X" />
-    <appMagic:includeProperty name="Y" />
-    <appMagic:includeProperty name="Width" defaultValue="100" />
-    <appMagic:includeProperty name="Height" defaultValue="100" />
-    <!-- Behavior Properties -->
-    <appMagic:includeProperty name="OnSelect" direction="in" isPrimaryInputProperty="true" />
-    <!-- Hidden properties -->
-    <appMagic:includeProperty name="minimumWidth" defaultValue="1" />
-    <appMagic:includeProperty name="minimumHeight" defaultValue="20" />
-    <appMagic:includeProperty name="maximumWidth" defaultValue="1366" />
-    <appMagic:includeProperty name="maximumHeight" defaultValue="768" />
-    <appMagic:includeProperty name="PreserveAspectRatio" defaultValue="false" />
-  </appMagic:includeProperties>
-  <appMagic:insertMetadata>
-    <appMagic:category name="Shapes" priority="110" />
-  </appMagic:insertMetadata>
-  <!-- Display metadata providing property visibility, order, sections, and grouping in UI (e.g. properties panel) -->
-  <appMagic:displayMetadata>
-    <appMagic:section>
-      <appMagic:property name="DisplayMode" />
-    </appMagic:section>
-    <appMagic:section>
-      <appMagic:property name="Visible" />
-      <appMagic:propertyGroup name="Position">
-        <appMagic:property name="X" />
-        <appMagic:property name="Y" />
-      </appMagic:propertyGroup>
-      <appMagic:propertyGroup name="Size">
-        <appMagic:property name="Width" />
-        <appMagic:property name="Height" />
-      </appMagic:propertyGroup>
-    </appMagic:section>
-    <appMagic:section>
-      <appMagic:propertyGroup name="Color">
-        <appMagic:property name="Fill" showInFloatie="true" showInCommandBar="true" />
-      </appMagic:propertyGroup>
-      <appMagic:propertyGroup name="Border">
-        <appMagic:property name="BorderStyle" showInCommandBar="true" />
-        <appMagic:property name="BorderThickness" showInCommandBar="true" />
-        <appMagic:property name="BorderColor" showInCommandBar="true" />
-      </appMagic:propertyGroup>
-    </appMagic:section>
-    <appMagic:section>
-      <appMagic:propertyGroup name="DisabledColor">
-        <appMagic:property name="DisabledFill" />
-      </appMagic:propertyGroup>
-      <appMagic:propertyGroup name="HoverColor">
-        <appMagic:property name="HoverFill" />
-      </appMagic:propertyGroup>
-      <appMagic:propertyGroup name="PressedColor">
-        <appMagic:property name="PressedFill" />
-      </appMagic:propertyGroup>
-      <appMagic:property name="Tooltip" />
-      <appMagic:property name="TabIndex" />
-    </appMagic:section>
-  </appMagic:displayMetadata>
-  <appMagic:conversion from="2.0.0" to="2.1.0">
-    <!-- Changed to access Width and Height on measuredProperties -->
-    <appMagic:conversionAction type="block" newDocVersion="1.295" />
-  </appMagic:conversion>
-  <appMagic:conversion from="2.1.0" to="2.1.1">
-    <!-- Reverted previous change (Width and Height properties now return actual values) -->
-  </appMagic:conversion>
-  <appMagic:conversion from="2.1.1" to="2.1.2">
-    <!-- KO template changes for accessibility fixes -->
-  </appMagic:conversion>
-  <appMagic:conversion from="2.1.2" to="2.2.0">
-    <appMagic:conversionAction type="add" name="ContentLanguage" />
-  </appMagic:conversion>
-  <appMagic:conversion from="2.2.0" to="2.3.0">
-    <!-- Adding showInCommandBar flag -->
-  </appMagic:conversion>
-</widget>
\ No newline at end of file