diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index 67086ccdb9bd815f64e16253e6e3f6a257c27c37..c355b26b67e65bbe5fdd34ea6768f0cbdd83224b 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 14:17:35",
+  "HeaderLastSavedDateTimeUTC": "01/18/2024 14:31:12",
   "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 08dcfb00a72f6b006ddb66b2a1f5a45c95708c17..4c3ade814f28f7cab4004c8d73ad93e65501d4f4 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -9,8 +9,8 @@
     "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_2qIO9rLS8XCF9x/PNha14mfbpQkefQCp8f3tuyr+hTg=",
-    "Header.json": "C8_FoYnzDZT93gBkJyV7RB5yuI3DfEF6ntWxNpgXG0cgOU=",
+    "Controls\\4.json": "C8_CQIXsJYWrkOyZeCRgudHLqsLGiDAw/MT29EfYTko4yo=",
+    "Header.json": "C8_oIuWN1/vvBpCLw9Y+bN1V7s1c4l97tFReD2exNga5EA=",
     "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -19,15 +19,15 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_KFeb+b06GLmg3Hb1uu8+LARSeS2X3av++KQg+bZEClM=",
+  "ClientStampedChecksum": "C8_T1MCRBCvjF9uUCaef9PK2thrR9b/tHSAUvqDfZ5Xoi4=",
   "ServerPerFileChecksums": {
     "AppCheckerResult.sarif": "C8_N4XEmEN8UObsfZnRbymA9dKLykMBGRYKXNtP0OZG3bk=",
     "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_2qIO9rLS8XCF9x/PNha14mfbpQkefQCp8f3tuyr+hTg=",
-    "Header.json": "C8_FoYnzDZT93gBkJyV7RB5yuI3DfEF6ntWxNpgXG0cgOU=",
+    "Controls\\4.json": "C8_CQIXsJYWrkOyZeCRgudHLqsLGiDAw/MT29EfYTko4yo=",
+    "Header.json": "C8_oIuWN1/vvBpCLw9Y+bN1V7s1c4l97tFReD2exNga5EA=",
     "Properties.json": "C8_2Nj2nMrhtXCfPyv58YRqId9Pclmrgiq4uUyNsaCtijM=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
@@ -36,5 +36,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_KFeb+b06GLmg3Hb1uu8+LARSeS2X3av++KQg+bZEClM="
+  "ServerStampedChecksum": "C8_T1MCRBCvjF9uUCaef9PK2thrR9b/tHSAUvqDfZ5Xoi4="
 }
\ No newline at end of file
diff --git a/fluentui-ard/Src/BaseScreen.fx.yaml b/fluentui-ard/Src/BaseScreen.fx.yaml
index ed4d8f64327ee602516eeaaa75af31199ba9ac8f..f3574a46e63934ad9568fa4252f5feedd319ba0a 100644
--- a/fluentui-ard/Src/BaseScreen.fx.yaml
+++ b/fluentui-ard/Src/BaseScreen.fx.yaml
@@ -18,6 +18,7 @@ BaseScreen As screen:
             Color: =RGBA(255, 255, 255, 1)
             DisabledBorderColor: =RGBA(0, 0, 0, 0)
             DisabledColor: =RGBA(255, 255, 255, 1)
+            Fill: =RGBA(0, 52, 128, 1)
             FocusedBorderThickness: =2
             Font: =Font.'Segoe UI'
             Height: =ConBan.Height
diff --git a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
index 12112a2fe7e59c204ec78fe96df5845b58311326..c04ef5323e9e42bf9968a5d3b447edba968a5a2f 100644
--- a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
+++ b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
@@ -38,7 +38,14 @@
         "HoverBorderColor",
         "BorderStyle",
         "FocusedBorderColor",
-        "Fill",
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "",
+          "InvariantPropertyName": "Fill",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
+        },
         "DisabledFill",
         "PressedFill",
         "HoverFill",