diff --git a/fluentui-ard/Entropy/AppCheckerResult.sarif b/fluentui-ard/Entropy/AppCheckerResult.sarif
index 4bc28b10093e28b61618a97ea60d13a0234c9fbc..53ece535a6b96d5587f9fae87e79294abd0d806d 100644
--- a/fluentui-ard/Entropy/AppCheckerResult.sarif
+++ b/fluentui-ard/Entropy/AppCheckerResult.sarif
@@ -193,17 +193,17 @@
             {
               "logicalLocations": [
                 {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.ShowLabel"
+                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.TabIndex"
                 }
               ],
               "physicalLocation": {
                 "address": {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.ShowLabel",
+                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.TabIndex",
                   "relativeAddress": 0
                 }
               },
               "properties": {
-                "member": "ShowLabel",
+                "member": "TabIndex",
                 "module": "Screen1",
                 "type": "Screen1.ConFkt1.Completionmode1"
               }
@@ -213,10 +213,10 @@
             "id": "issue"
           },
           "properties": {
-            "level": "Medium"
+            "level": "Low"
           },
-          "ruleId": "acc-HelpfulControlSettingNeeded",
-          "ruleIndex": 5
+          "ruleId": "acc-TabOrderShouldBeChecked",
+          "ruleIndex": 4
         },
         {
           "locations": [
@@ -253,17 +253,17 @@
             {
               "logicalLocations": [
                 {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.TabIndex"
+                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.ShowLabel"
                 }
               ],
               "physicalLocation": {
                 "address": {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.TabIndex",
+                  "fullyQualifiedName": "Screen1.ConFkt1.Completionmode1.ShowLabel",
                   "relativeAddress": 0
                 }
               },
               "properties": {
-                "member": "TabIndex",
+                "member": "ShowLabel",
                 "module": "Screen1",
                 "type": "Screen1.ConFkt1.Completionmode1"
               }
@@ -273,10 +273,10 @@
             "id": "issue"
           },
           "properties": {
-            "level": "Low"
+            "level": "Medium"
           },
-          "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 4
+          "ruleId": "acc-HelpfulControlSettingNeeded",
+          "ruleIndex": 5
         },
         {
           "locations": [
diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index e5cc29ba0397e860f291c905104be3e3ea34a9a1..a00154fc256a49700d01c9a48b83e0a965cfdbf7 100644
--- a/fluentui-ard/Entropy/Entropy.json
+++ b/fluentui-ard/Entropy/Entropy.json
@@ -21,7 +21,7 @@
   },
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "01/15/2024 07:45:49",
+  "HeaderLastSavedDateTimeUTC": "01/15/2024 07:48:16",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "4f97c1a9-66e5-4408-9cd9-6d91353932e7": "\"/providers/microsoft.powerapps/apis/shared_office365/connections/shared-office365-691d88fb-dc12-4d7f-afc5-caaebbf651d6\"",
diff --git a/fluentui-ard/Entropy/checksum.json b/fluentui-ard/Entropy/checksum.json
index 18300d8d76f92420d52bb5d898e28dbd7a340af1..d51ca3d865b72223a3912c00fc8f08ff3aaa7b15 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -4,12 +4,12 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_wCLOYCxv9s2XA71mwx7q63iEej3YROn1TiE5SxEUAp4=",
+    "AppCheckerResult.sarif": "C8_3t67maqykkF9mAGo01+/bR2UggUbSbnUYouz0Ir/1+k=",
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_mlQJ4KixnH+ZStGUp4tqn4sUwkwPdLp3YnHXLDfM6lM=",
-    "Header.json": "C8_CR/y8Lfhhl266mQdsebFrTYQiY5NM+C62HFbof44fmM=",
+    "Controls\\4.json": "C8_5aXBDhHTmJ0jiDNcDzxw1WzIIiyHAWfOCS9QaLu3pBc=",
+    "Header.json": "C8_QFbFPN+a96c6BXC/YNuHLBoa3MOaIgSmMWDF64OKPf8=",
     "Properties.json": "C8_4898/kRDKmPthQiRk9Ow5td3EDUTJBuIyP1C38w2y3A=",
     "References\\DataSources.json": "C8_qxHlSGjI1/gMkJLOaasKKGfYusaY9/2xy/2UacxP94g=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -18,14 +18,14 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_4sm1/okFpFvsPQtAf0QoUQTseIEb8bwdZdmIfrID7Qs=",
+  "ClientStampedChecksum": "C8_ZD3V5mQUXJQIJh6CwhhCIUTb2ba0IXI27haYQk4983s=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_wCLOYCxv9s2XA71mwx7q63iEej3YROn1TiE5SxEUAp4=",
+    "AppCheckerResult.sarif": "C8_3t67maqykkF9mAGo01+/bR2UggUbSbnUYouz0Ir/1+k=",
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_mlQJ4KixnH+ZStGUp4tqn4sUwkwPdLp3YnHXLDfM6lM=",
-    "Header.json": "C8_CR/y8Lfhhl266mQdsebFrTYQiY5NM+C62HFbof44fmM=",
+    "Controls\\4.json": "C8_5aXBDhHTmJ0jiDNcDzxw1WzIIiyHAWfOCS9QaLu3pBc=",
+    "Header.json": "C8_QFbFPN+a96c6BXC/YNuHLBoa3MOaIgSmMWDF64OKPf8=",
     "Properties.json": "C8_4898/kRDKmPthQiRk9Ow5td3EDUTJBuIyP1C38w2y3A=",
     "References\\DataSources.json": "C8_qxHlSGjI1/gMkJLOaasKKGfYusaY9/2xy/2UacxP94g=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -34,5 +34,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_4sm1/okFpFvsPQtAf0QoUQTseIEb8bwdZdmIfrID7Qs="
+  "ServerStampedChecksum": "C8_ZD3V5mQUXJQIJh6CwhhCIUTb2ba0IXI27haYQk4983s="
 }
\ No newline at end of file
diff --git a/fluentui-ard/Src/EditorState/Screen1.editorstate.json b/fluentui-ard/Src/EditorState/Screen1.editorstate.json
index 4b231791d2518dbef406c7ceaf96e4aa2865cc73..2f6522b6670abb259a9da96a7a80a80157daeb4e 100644
--- a/fluentui-ard/Src/EditorState/Screen1.editorstate.json
+++ b/fluentui-ard/Src/EditorState/Screen1.editorstate.json
@@ -1079,11 +1079,12 @@
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
+        "OnUncheck",
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "false",
-          "InvariantPropertyName": "OnUncheck",
+          "InvariantPropertyName": "OnCheck",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
@@ -1091,7 +1092,7 @@
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
           "AutoRuleBindingString": "false",
-          "InvariantPropertyName": "OnCheck",
+          "InvariantPropertyName": "OnChange",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         }
@@ -1314,6 +1315,11 @@
           "Category": "Behavior",
           "PropertyName": "OnCheck",
           "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Behavior",
+          "PropertyName": "OnChange",
+          "RuleProviderType": "Unknown"
         }
       ],
       "StyleName": "defaultToggleSwitchStyle",
diff --git a/fluentui-ard/Src/Screen1.fx.yaml b/fluentui-ard/Src/Screen1.fx.yaml
index 007893f17b5eda3508e44dddd0a796553b7942b3..cc48d1fa2896bf758b7a7df4f36ffc35f769ebb0 100644
--- a/fluentui-ard/Src/Screen1.fx.yaml
+++ b/fluentui-ard/Src/Screen1.fx.yaml
@@ -60,8 +60,8 @@ Screen1 As screen:
             Height: =ConFkt1.Height/2
             HoverBorderColor: =RGBA(0, 52, 128, 1)
             LabelPaddingLeft: =7
-            OnCheck: =0.8
-            OnUncheck: =0.4
+            OnChange: =
+            OnCheck: =false   
             PressedBorderColor: =RGBA(0, 52, 128, 1)
             ShowLabel: =false
             Size: =18