diff --git a/fluentui-ard/CanvasManifest.json b/fluentui-ard/CanvasManifest.json
index 3d7d7f18f789b14a03d7551264788540309c8d1f..6668988af8e188bd7457bcd75fcea403192d38b1 100644
--- a/fluentui-ard/CanvasManifest.json
+++ b/fluentui-ard/CanvasManifest.json
@@ -11,7 +11,7 @@
   },
   "Properties": {
     "AppCreationSource": "AppFromScratch",
-    "AppDescription": "Accessible Label 2",
+    "AppDescription": "YouYou",
     "AppPreviewFlagsMap": {
       "aibuilderserviceenrollment": false,
       "allowmultiplescreensincanvaspages": false,
diff --git a/fluentui-ard/Entropy/AppCheckerResult.sarif b/fluentui-ard/Entropy/AppCheckerResult.sarif
index 7e4b1c144766e39af1070b432b89c3516682f5e1..c622e864248994b1fd510a3c7f78eaa5fbf1fbd0 100644
--- a/fluentui-ard/Entropy/AppCheckerResult.sarif
+++ b/fluentui-ard/Entropy/AppCheckerResult.sarif
@@ -68,36 +68,6 @@
           "ruleId": "acc-TabIndexShouldBeDefinedForInteractiveControl",
           "ruleIndex": 1
         },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Screen1.ConFkt1.SendMail1.FocusedBorderThickness"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Screen1.ConFkt1.SendMail1.FocusedBorderThickness",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "FocusedBorderThickness",
-                "module": "Screen1",
-                "type": "Screen1.ConFkt1.SendMail1"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Medium"
-          },
-          "ruleId": "acc-FocusBorderShouldBeVisible",
-          "ruleIndex": 2
-        },
         {
           "locations": [
             {
@@ -126,36 +96,6 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 3
-        },
-        {
-          "locations": [
-            {
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Eraser1.FocusedBorderThickness"
-                }
-              ],
-              "physicalLocation": {
-                "address": {
-                  "fullyQualifiedName": "Screen1.ConFkt1.Eraser1.FocusedBorderThickness",
-                  "relativeAddress": 0
-                }
-              },
-              "properties": {
-                "member": "FocusedBorderThickness",
-                "module": "Screen1",
-                "type": "Screen1.ConFkt1.Eraser1"
-              }
-            }
-          ],
-          "message": {
-            "id": "issue"
-          },
-          "properties": {
-            "level": "Medium"
-          },
-          "ruleId": "acc-FocusBorderShouldBeVisible",
           "ruleIndex": 2
         },
         {
@@ -186,7 +126,7 @@
             "level": "Medium"
           },
           "ruleId": "acc-HelpfulControlSettingNeeded",
-          "ruleIndex": 4
+          "ruleIndex": 3
         },
         {
           "locations": [
@@ -216,7 +156,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 3
+          "ruleIndex": 2
         },
         {
           "locations": [
@@ -246,7 +186,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 3
+          "ruleIndex": 2
         },
         {
           "locations": [
@@ -276,7 +216,7 @@
             "level": "Medium"
           },
           "ruleId": "app-UnusedMediaResources",
-          "ruleIndex": 5
+          "ruleIndex": 4
         }
       ],
       "tool": {
@@ -318,23 +258,6 @@
                 "whyFix": "People who use the keyboard with your app will not be able to access this element without a tab stop."
               }
             },
-            {
-              "id": "acc-FocusBorderShouldBeVisible",
-              "messageStrings": {
-                "issue": {
-                  "text": "Focus isn't showing"
-                }
-              },
-              "properties": {
-                "componentType": "app",
-                "howToFix": [
-                  "Change the FocusedBorderThickness property to be more than 0."
-                ],
-                "level": "Medium",
-                "primaryCategory": "accessibility",
-                "whyFix": "If the focus isn't visible, people who don't use a mouse won't be able to see it when they're interacting with the app."
-              }
-            },
             {
               "id": "acc-TabOrderShouldBeChecked",
               "messageStrings": {
diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index a95c0558de9aff0755d3adcc2aced7a1ed29ef5c..48a641ce879d4a6edb6b5036783ab85055a3e284 100644
--- a/fluentui-ard/Entropy/Entropy.json
+++ b/fluentui-ard/Entropy/Entropy.json
@@ -26,7 +26,7 @@
   "DoesTestStepsMetadataExist": true,
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "01/18/2024 10:55:14",
+  "HeaderLastSavedDateTimeUTC": "01/18/2024 11:02:55",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "3949869c-0bc9-4a51-90cd-bf1287c9e326": "\"/providers/microsoft.powerapps/apis/shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50/connections/shared-azure-2dopena-3f4cdc89-63b5-4018-882d-1f1c97eb18e0\"",
diff --git a/fluentui-ard/Entropy/checksum.json b/fluentui-ard/Entropy/checksum.json
index cb844f5fa78264fa22ea2ea18bfb9992055164b9..163915be8161d08d36a7637444355e169a9d3e96 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -4,14 +4,14 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_7d20kcSQNRogaEaT7/StMdAmGlZXdoRcLFN7aoMVoc4=",
+    "AppCheckerResult.sarif": "C8_9mOMexI/NjfJBbQndyeS1qobARauKrM829uX8tOuq9w=",
     "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=",
     "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_sN3RU9GjxsFq6+l6FgwV9Hr4qTNqfZhcdl1ABUE3k9k=",
-    "Header.json": "C8_+rce41AORvF0Hj09vxSV+9WnqOcWUzBCmwwVhydT+jI=",
-    "Properties.json": "C8_E11El5cmrdnJ/79Z8Px6DuQf7OzjvgxOThDZrbZA6x8=",
+    "Controls\\4.json": "C8_FfJ1vU0ot2FwMZMryXUrYNyME8YlxBvVes5GQcBTRto=",
+    "Header.json": "C8_6F22c+3FJVXJ5pb+bdqkbNMmA8lsk6s3sRXWAHZY7SE=",
+    "Properties.json": "C8_ftz8EUyanPLKd06z84WmpyIkY3sy6lrMtS5sbseOMgI=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_Q5vHVg4hCY/pHa0nGIsENvRjOYaeHdVRuAM2mbph9pI=",
@@ -19,16 +19,16 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_cYiegqpPe6MTjaTOu6kzfO6xhE2Gc6hxWV09h1VepAM=",
+  "ClientStampedChecksum": "C8_4raqU82tdqItK5UaTCXDIaTuebon0jYJLs34NcCg6N8=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_7d20kcSQNRogaEaT7/StMdAmGlZXdoRcLFN7aoMVoc4=",
+    "AppCheckerResult.sarif": "C8_9mOMexI/NjfJBbQndyeS1qobARauKrM829uX8tOuq9w=",
     "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=",
     "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_sN3RU9GjxsFq6+l6FgwV9Hr4qTNqfZhcdl1ABUE3k9k=",
-    "Header.json": "C8_+rce41AORvF0Hj09vxSV+9WnqOcWUzBCmwwVhydT+jI=",
-    "Properties.json": "C8_E11El5cmrdnJ/79Z8Px6DuQf7OzjvgxOThDZrbZA6x8=",
+    "Controls\\4.json": "C8_FfJ1vU0ot2FwMZMryXUrYNyME8YlxBvVes5GQcBTRto=",
+    "Header.json": "C8_6F22c+3FJVXJ5pb+bdqkbNMmA8lsk6s3sRXWAHZY7SE=",
+    "Properties.json": "C8_ftz8EUyanPLKd06z84WmpyIkY3sy6lrMtS5sbseOMgI=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_Q5vHVg4hCY/pHa0nGIsENvRjOYaeHdVRuAM2mbph9pI=",
@@ -36,5 +36,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_cYiegqpPe6MTjaTOu6kzfO6xhE2Gc6hxWV09h1VepAM="
+  "ServerStampedChecksum": "C8_4raqU82tdqItK5UaTCXDIaTuebon0jYJLs34NcCg6N8="
 }
\ 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 3b5652bb66f208482d0b8009377d402911425e84..fb5337dad74b5d6841f37f045c12eed2c85d31c1 100644
--- a/fluentui-ard/Src/EditorState/Screen1.editorstate.json
+++ b/fluentui-ard/Src/EditorState/Screen1.editorstate.json
@@ -89,7 +89,14 @@
         "ZIndex",
         "LineHeight",
         "BorderThickness",
-        "FocusedBorderThickness",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "4",
+          "InvariantPropertyName": "FocusedBorderThickness",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
@@ -1921,7 +1928,14 @@
           "IsLockable": false,
           "NameMapSourceSchema": "?"
         },
-        "FocusedBorderThickness",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "4",
+          "InvariantPropertyName": "FocusedBorderThickness",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
@@ -2625,7 +2639,14 @@
         "ZIndex",
         "LineHeight",
         "BorderThickness",
-        "FocusedBorderThickness",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "4",
+          "InvariantPropertyName": "FocusedBorderThickness",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
@@ -3289,7 +3310,14 @@
         "FocusedBorderColor",
         "ZIndex",
         "BorderThickness",
-        "FocusedBorderThickness",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "4",
+          "InvariantPropertyName": "FocusedBorderThickness",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         {
           "AFDDataSourceName": "",
           "AutoRuleBindingEnabled": false,
diff --git a/fluentui-ard/Src/Screen1.fx.yaml b/fluentui-ard/Src/Screen1.fx.yaml
index d7c25c3293ea9d916d4a12a6c34d00ae4e7cc12e..dca3e2575db8c7220c5b52c93ebb322db5ac2777 100644
--- a/fluentui-ard/Src/Screen1.fx.yaml
+++ b/fluentui-ard/Src/Screen1.fx.yaml
@@ -18,7 +18,7 @@ Screen1 As screen:
             Color: =RGBA(255, 255, 255, 1)
             DisabledBorderColor: =RGBA(0, 0, 0, 0)
             DisabledColor: =RGBA(255, 255, 255, 1)
-            FocusedBorderThickness: =4
+            FocusedBorderThickness: =2
             Font: =Font.'Segoe UI'
             Height: =ConBan.Height
             Italic: =true
@@ -56,7 +56,6 @@ Screen1 As screen:
             FalseFill: =RGBA(255, 255, 255, 1)
             FalseHoverFill: =RGBA(251, 188, 159, 1)
             FalseText: ="false"
-            FocusedBorderThickness: =4
             Font: =Font.'Segoe UI'
             HandleFill: =RGBA(128, 128, 128, 1)
             Height: =ConFkt1.Height/2
@@ -87,7 +86,7 @@ Screen1 As screen:
             Color: =RGBA(255, 255, 255, 1)
             DisabledBorderColor: =RGBA(0, 0, 0, 0)
             DisabledColor: =RGBA(161, 159, 157, 1)
-            FocusedBorderThickness: =4
+            FocusedBorderThickness: =2
             Font: =Font.'Segoe UI'
             Height: =Creativity1.Height
             Size: =Creativity1.Height/2
@@ -107,7 +106,6 @@ Screen1 As screen:
             DisabledColor: =RGBA(204, 204, 204, 1)
             DisabledFill: =RGBA(0, 0, 0, 0)
             Fill: =RGBA(0, 52, 128, 1)
-            FocusedBorderThickness: =0
             Height: =Creativity1.Height*1.6
             HoverBorderColor: =RGBA(0, 0, 0, 0)
             HoverColor: =RGBA(251, 188, 159, 1)
@@ -133,7 +131,6 @@ Screen1 As screen:
             DisabledColor: =RGBA(204, 204, 204, 1)
             DisabledFill: =RGBA(0, 0, 0, 0)
             Fill: =RGBA(0, 52, 128, 1)
-            FocusedBorderThickness: =0
             Height: =Creativity1.Height*1.6
             HoverBorderColor: =RGBA(0, 0, 0, 0)
             HoverColor: =RGBA(251, 188, 159, 1)
@@ -252,7 +249,6 @@ Screen1 As screen:
             DisabledColor: =RGBA(225, 223, 221, 1)
             DisabledFill: =RGBA(0, 0, 0, 0)
             Fill: =RGBA(0, 52, 128, 1)
-            FocusedBorderThickness: =4
             Height: =Creativity1.Height*1.3
             HoverBorderColor: =RGBA(0, 0, 0, 0)
             HoverColor: =RGBA(251, 188, 159, 1)