diff --git a/.github/fabricbot.json b/.github/fabricbot.json
deleted file mode 100644
index 20db2533..00000000
--- a/.github/fabricbot.json
+++ /dev/null
@@ -1,1550 +0,0 @@
-{
-  "version": "1.0",
-  "tasks": [
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "90dqm0PD7",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isInProject",
-                  "parameters": {
-                    "projectName": "Feature Tracking"
-                  }
-                }
-              ]
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "hasLabel",
-                  "parameters": {
-                    "label": "Enhancement"
-                  }
-                },
-                {
-                  "name": "labelAdded",
-                  "parameters": {
-                    "label": "Enhancement"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addToProject",
-            "parameters": {
-              "projectName": "Feature Tracking",
-              "columnName": "Pitch"
-            }
-          },
-          {
-            "name": "addReactionToIssue",
-            "parameters": {
-              "reaction": "+1"
-            }
-          }
-        ],
-        "taskName": "Feature Request: new pitch created"
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "DEo03OM0n",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Enhancement"
-              }
-            },
-            {
-              "name": "isInProject",
-              "parameters": {
-                "projectName": "Feature Tracking",
-                "columnName": "Pitch"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            },
-            {
-              "name": "labelAdded",
-              "parameters": {
-                "label": "needs pitch review"
-              }
-            }
-          ]
-        },
-        "taskName": "Feature Request: \"needs pitch review\" label added to pitch in \"Feature Tracking\" board",
-        "actions": [
-          {
-            "name": "moveToProjectColumn",
-            "parameters": {
-              "projectName": "Feature Tracking",
-              "columnName": "Pitch (Needs Review)"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs more info"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This pitch looks like it has everything it needs for review. In the meantime, we'll keep this idea open for discussion so the community has the chance to provide feedback. Check out our [New Feedback Process](https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md) for more info on the user-centered process we follow for new feature development."
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "J1uYC69hr",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Enhancement"
-              }
-            },
-            {
-              "name": "isInProject",
-              "parameters": {
-                "projectName": "Feature Tracking"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            },
-            {
-              "name": "labelAdded",
-              "parameters": {
-                "label": "needs more info"
-              }
-            }
-          ]
-        },
-        "taskName": "Feature Pitch: \"needs more info\" label added to pitch in \"Feature Tracking\" board",
-        "actions": [
-          {
-            "name": "moveToProjectColumn",
-            "parameters": {
-              "projectName": "Feature Tracking",
-              "columnName": "Pitch"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs pitch review"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "EQ-12A2cG",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Enhancement"
-              }
-            },
-            {
-              "name": "isInProject",
-              "parameters": {
-                "projectName": "Feature Tracking"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            },
-            {
-              "name": "labelAdded",
-              "parameters": {
-                "label": "needs spec"
-              }
-            }
-          ]
-        },
-        "taskName": "Feature Request: \"needs spec\" label added to pitch in \"Feature Tracking\" board",
-        "actions": [
-          {
-            "name": "moveToProjectColumn",
-            "parameters": {
-              "projectName": "Feature Tracking",
-              "columnName": "Planning"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs pitch review"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "We reviewed the pitch and would love to explore this idea further! The pitch is a great start, but there are still some open questions. I am moving this issue into [planning](https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md#step-2-planning) to iron out some of those details and I created [calculator-specs/TBD](https://github.com/microsoft/calculator-specs/tree/TBD) to track progress. A human will follow up with some feedback on your pitch shortly. Keep in mind that not all ideas that make it into the planning phase are guaranteed to make it to release. For more information on next steps, check out our [spec workflow](https://github.com/Microsoft/calculator-specs#workflow)."
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "9xOafGaWd",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Enhancement"
-              }
-            },
-            {
-              "name": "labelAdded",
-              "parameters": {
-                "label": "pitch declined"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            },
-            {
-              "operator": "or",
-              "operands": [
-                {
-                  "name": "isInProjectColumn",
-                  "parameters": {
-                    "projectName": "Feature Tracking",
-                    "columnName": "Pitch (Needs Review)"
-                  }
-                },
-                {
-                  "name": "isInProjectColumn",
-                  "parameters": {
-                    "projectName": "Feature Tracking",
-                    "columnName": "Pitch"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "isInProject",
-              "parameters": {
-                "projectName": "Feature Tracking"
-              }
-            }
-          ]
-        },
-        "taskName": "Feature Request: \"pitch declined\" label added to pitch in \"Feature Tracking\" board",
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "Thanks again for submitting your idea! However, after reviewing this pitch more closely, we do not believe it is a great fit for the product at this time. Thank you for your contribution to Calculator!"
-            }
-          },
-          {
-            "name": "removeFromProject",
-            "parameters": {
-              "projectName": "Feature Tracking",
-              "isOrgProject": false
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs pitch review"
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "oZOHQYqIH",
-      "config": {
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Enhancement"
-              }
-            },
-            {
-              "name": "isInProjectColumn",
-              "parameters": {
-                "projectName": "Feature Tracking",
-                "columnName": "Planning"
-              }
-            },
-            {
-              "name": "isOpen",
-              "parameters": {}
-            },
-            {
-              "name": "labelAdded",
-              "parameters": {
-                "label": "needs spec review"
-              }
-            }
-          ]
-        },
-        "taskName": "Feature Request: \"needs spec review\" label added to pitch in \"Feature Tracking\" board",
-        "actions": [
-          {
-            "name": "moveToProjectColumn",
-            "parameters": {
-              "columnName": "Planning (Needs Review)",
-              "projectName": "Feature Tracking"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs spec"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This feature is ready for spec review! We will leave Microsoft/calculator-specs# open for a little while to give the community the chance to review and provide feedback. Keep in mind that not all ideas that make it into spec review are guaranteed to make it to release. For more information on next steps, check out our [new feature process](https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md) and [spec workflow](https://github.com/Microsoft/calculator-specs#workflow)."
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "id": "tu0JwvC3X",
-      "config": {
-        "taskName": "Issues: Add \"no recent activity\" to non-approved issues that are not feature requests",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "approved"
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "triage approved"
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "Enhancement"
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "needs attention"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been automatically marked as stale because it has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**. Thank you for your contributions to Windows Calculator!"
-            }
-          }
-        ]
-      },
-      "disabled": true
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "id": "TsBGagZo7",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "no recent activity"
-              }
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ],
-        "taskName": "Issues: Remove \"no recent activity\" when an issue is commented on",
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "id": "0e0TMuQWL",
-      "config": {
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "taskName": "Issues: Close stale issues",
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "triage needed"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "investigate"
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "disabled": true
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "id": "ybTVd5Fwj",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "closed"
-              }
-            }
-          ]
-        },
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ],
-        "taskName": "Issues: Clean up labels on closed issues",
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs pitch review"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs more info"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs spec"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "help wanted"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs spec review"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs spec"
-            }
-          }
-        ],
-        "dangerZone": {
-          "respondToBotActions": true,
-          "acceptRespondToBotActions": true
-        }
-      }
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Add \"needs author feedback\" label to PRs when changes are requested",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "submitted"
-              }
-            },
-            {
-              "name": "isReviewState",
-              "parameters": {
-                "state": "changes_requested"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "nx2_P90Rj1",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"needs author feedback\" label when author responds to a PR",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "needs author feedback"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request",
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "gZuiBhKkyR",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"needs author feedback\" label when author comments on PR",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "needs author feedback"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "Glp85WqHJ5",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"needs author feedback\" label when author responds to a PR review comment",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "needs author feedback"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "UUCiOR514E",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"no recent activity\" label from pull requests",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "no recent activity"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request",
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "_YRyPxcA1h",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"no recent activity\" label when a PR is commented on",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "no recent activity"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "rEvX0VIqw9",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Remove \"no recent activity\" label when a PR is reviewed",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "no recent activity"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "hOTo334CMP",
-      "disabled": false
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "PR: Close stale PRs",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isPr",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "ki5HqIKb5w",
-      "disabled": true
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "PR: Add \"no recent activity\" label to PRs",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isPr",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "needs author feedback"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "no recent activity"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. Thank you for your contributions to Windows Calculator!"
-            }
-          }
-        ]
-      },
-      "id": "NuVE9uOkcA",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "AutoMerge",
-      "subCapability": "AutoMerge",
-      "version": "1.0",
-      "config": {
-        "taskName": "PR: Automatically merge PRs",
-        "label": "AutoMerge",
-        "silentMode": false,
-        "minMinutesOpen": 480,
-        "mergeType": "squash"
-      },
-      "id": "6EONuAShR1",
-      "disabled": true
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "EmailCleanser",
-      "subCapability": "EmailCleanser",
-      "version": "1.0",
-      "id": "4XBi1jeNi",
-      "config": {
-        "taskName": "Email Reply Cleaner"
-      }
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isClosed",
-            "parameters": {}
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 30
-            }
-          },
-          {
-            "name": "isUnlocked",
-            "parameters": {}
-          },
-          {
-            "name": "isIssue",
-            "parameters": {}
-          }
-        ],
-        "taskName": "Lock issues closed without activity for over 30 days",
-        "actions": [
-          {
-            "name": "lockIssue",
-            "parameters": {
-              "reason": "resolved"
-            }
-          }
-        ]
-      },
-      "id": "53dIr53Wxp"
-    }
-  ],
-  "userGroups": []
-}
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
new file mode 100644
index 00000000..6704b646
--- /dev/null
+++ b/.github/policies/resourceManagement.yml
@@ -0,0 +1,135 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: needs author feedback
+      - noActivitySince:
+          days: 7
+      - isNotLabeledWith:
+          label: no recent activity
+      actions:
+      - addLabel:
+          label: no recent activity
+      - addReply:
+          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. Thank you for your contributions to Windows Calculator!
+    eventResponderTasks:
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: no recent activity
+      then:
+      - removeLabel:
+          label: no recent activity
+      description: 
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Closed
+      then:
+      - removeLabel:
+          label: needs pitch review
+      - removeLabel:
+          label: needs more info
+      - removeLabel:
+          label: needs spec
+      - removeLabel:
+          label: no recent activity
+      - removeLabel:
+          label: help wanted
+      - removeLabel:
+          label: needs spec review
+      - removeLabel:
+          label: needs spec
+      description: 
+      triggerOnOwnActions: true
+    - if:
+      - payloadType: Pull_Request_Review
+      - isAction:
+          action: Submitted
+      - isReviewState:
+          reviewState: Changes_requested
+      then:
+      - addLabel:
+          label: needs author feedback
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - isActivitySender:
+          issueAuthor: True
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: needs author feedback
+      then:
+      - removeLabel:
+          label: needs author feedback
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: needs author feedback
+      then:
+      - removeLabel:
+          label: needs author feedback
+      description: 
+    - if:
+      - payloadType: Pull_Request_Review
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: needs author feedback
+      then:
+      - removeLabel:
+          label: needs author feedback
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: no recent activity
+      then:
+      - removeLabel:
+          label: no recent activity
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: no recent activity
+      then:
+      - removeLabel:
+          label: no recent activity
+      description: 
+    - if:
+      - payloadType: Pull_Request_Review
+      - hasLabel:
+          label: no recent activity
+      then:
+      - removeLabel:
+          label: no recent activity
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      then:
+      - cleanEmailReply
+      description: 
+onFailure: 
+onSuccess: 
diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index ea5f5928..113111af 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -9,7 +9,7 @@ pr: none
 
 variables:
   versionMajor: 11
-  versionMinor: 2307
+  versionMinor: 2308
   versionBuild: $[counter(format('{0}.{1}.*', variables['versionMajor'], variables['versionMinor']), 0)]
   versionPatch: 0
 
diff --git a/nuget.config b/nuget.config
index 0b8604f4..e59e698f 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,9 +3,8 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="Toolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
index c0b3690a..9a9787c2 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
@@ -107,6 +107,14 @@ CurrencyDataLoader::CurrencyDataLoader(_In_ unique_ptr<ICurrencyHttpClient> clie
         if (GlobalizationPreferences::Languages->Size > 0)
         {
             m_responseLanguage = GlobalizationPreferences::Languages->GetAt(0);
+
+            // Workaround for Simplified Chinese localization issue of currency API.
+            std::wstring_view responseLanguage(m_responseLanguage->Data(), m_responseLanguage->Length());
+            std::match_results<std::wstring_view::const_iterator> match;
+            if (std::regex_match(responseLanguage.cbegin(), responseLanguage.cend(), match, std::wregex(L"zh-hans-[a-z]+", std::regex_constants::icase)))
+            {
+                m_responseLanguage = L"zh-CN";
+            }
         }
         else
         {
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 4f5693fb..653eafaf 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -793,9 +793,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Labs.Uwp.SettingsControls">
-      <Version>0.0.16</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 5b994de9..b94831fb 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -4714,11 +4714,11 @@
     <value>Appearance</value>
     <comment>Subtitle of appearance setting on Settings page</comment>
   </data>
-  <data name="AppThemeExpander.Header" xml:space="preserve">
+  <data name="SettingsAppThemeTitle.Text" xml:space="preserve">
     <value>App theme</value>
     <comment>Title of App theme expander</comment>
   </data>
-  <data name="AppThemeExpander.Description" xml:space="preserve">
+  <data name="SettingsAppThemeDescription.Text" xml:space="preserve">
     <value>Select which app theme to display</value>
     <comment>Description of App theme expander</comment>
   </data>
diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index 78308de4..44848a79 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:labs="using:CommunityToolkit.Labs.WinUI"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
              xmlns:utils="using:CalculatorApp.Utils"
@@ -15,7 +14,7 @@
         <ResourceDictionary>
             <Style x:Key="SettingsContentScrollViewStyle" TargetType="ScrollViewer">
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Top"/>
                 <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
                 <Setter Property="HorizontalScrollMode" Value="Disabled"/>
                 <Setter Property="IsHorizontalRailEnabled" Value="False"/>
@@ -32,19 +31,11 @@
                 <Setter Property="TextWrapping" Value="Wrap"/>
             </Style>
 
-            <Style x:Key="SettingsCategoryTitleTextBlockStyle"
-                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                   TargetType="TextBlock">
-                <Setter Property="Margin" Value="0,29,0,5"/>
-            </Style>
-
             <automation:NarratorNotifier x:Name="NarratorNotifier"/>
 
             <!-- Override default hyperlink button background color -->
             <StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTransparentBrush"/>
             <StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SubtleFillColorTransparentBrush"/>
-
-            <x:Double x:Key="SettingsCardSpacing">3</x:Double>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -53,6 +44,42 @@
             <RowDefinition Height="{x:Bind TitleBarHeight, Mode=OneWay}"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="LargeWideView">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="690"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ColumnAbout.Width" Value="324"/>
+                        <Setter Target="AboutContentGrid.(Grid.Row)" Value="0"/>
+                        <Setter Target="AboutContentGrid.(Grid.RowSpan)" Value="3"/>
+                        <Setter Target="AboutContentGrid.(Grid.Column)" Value="1"/>
+                        <Setter Target="AboutGroupTitle.Margin" Value="0"/>
+                        <Setter Target="AboutContentGrid.Margin" Value="60,0,0,0"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="SideVisible">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="632"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ColumnMain.Width" Value="*"/>
+                        <Setter Target="ColumnAbout.Width" Value="*"/>
+                        <Setter Target="AboutContentGrid.(Grid.Row)" Value="0"/>
+                        <Setter Target="AboutContentGrid.(Grid.RowSpan)" Value="3"/>
+                        <Setter Target="AboutContentGrid.(Grid.Column)" Value="1"/>
+                        <Setter Target="AboutGroupTitle.Margin" Value="0"/>
+                        <Setter Target="AboutContentGrid.Margin" Value="60,0,0,0"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="DefaultLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
+                    </VisualState.StateTriggers>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
 
         <Button x:Name="BackButton"
                 Grid.Row="0"
@@ -77,120 +104,160 @@
         </Grid>
 
         <ScrollViewer Grid.Row="1"
-                      Margin="0,30,0,0"
+                      Margin="0,60,0,0"
                       Padding="24,0,24,16"
                       Style="{StaticResource SettingsContentScrollViewStyle}">
+            <Grid x:Name="ContentGrid">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="ColumnMain" Width="*"/>
+                    <ColumnDefinition x:Name="ColumnAbout" Width="0"/>
+                </Grid.ColumnDefinitions>
 
-            <StackPanel Orientation="Vertical" Spacing="{StaticResource SettingsCardSpacing}">
-                <StackPanel.ChildrenTransitions>
-                    <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True"/>
-                    <RepositionThemeTransition IsStaggeringEnabled="False"/>
-                </StackPanel.ChildrenTransitions>
-                <TextBlock Style="{StaticResource SettingsCategoryTitleTextBlockStyle}"
+                <Grid.RowDefinitions>
+                    <RowDefinition x:Name="AppearanceTitleRow" Height="Auto"/>
+                    <RowDefinition x:Name="AppearanceExpanderRow" Height="Auto"/>
+                    <RowDefinition x:Name="AboutTitleContentRow" Height="*"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}"
                            AutomationProperties.HeadingLevel="Level1"
                            Text="{utils:ResourceString Name=SettingsAppearance/Text}"/>
-                <labs:SettingsExpander x:Name="AppThemeExpander"
-                                       Description="Select which app theme to display"
-                                       Header="App theme">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <FontIcon Glyph="&#xE790;"/>
-                    </labs:SettingsExpander.HeaderIcon>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
-                            <muxc:RadioButtons x:Name="ThemeRadioButtons"
-                                               Margin="0,-8,0,0"
-                                               SelectionChanged="OnThemeSelectionChanged">
-                                <RadioButton x:Name="LightThemeRadioButton"
-                                             Content="{utils:ResourceString Name=LightThemeRadioButton/Content}"
-                                             Tag="Light"/>
-                                <RadioButton x:Name="DarkThemeRadioButton"
-                                             Content="{utils:ResourceString Name=DarkThemeRadioButton/Content}"
-                                             Tag="Dark"/>
-                                <RadioButton x:Name="SystemThemeRadioButton"
-                                             Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
-                                             Tag="Default"/>
-                            </muxc:RadioButtons>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
 
-                <TextBlock x:Name="AboutGroupTitle"
-                           Style="{ThemeResource SettingsCategoryTitleTextBlockStyle}"
-                           AutomationProperties.HeadingLevel="Level1"
-                           Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
-                <labs:SettingsExpander x:Name="AboutExpander">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <BitmapIcon AutomationProperties.AccessibilityView="Raw" UriSource="ms-appx:///Assets/CalculatorAppList.png"/>
-                    </labs:SettingsExpander.HeaderIcon>
-                    <TextBlock x:Name="AboutBuildVersion"
-                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                               IsTextSelectionEnabled="True"/>
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard ContentAlignment="Left">
-                            <StackPanel Margin="0,4,0,6"
-                                        Orientation="Vertical"
-                                        Spacing="12">
+                <muxc:Expander x:Name="AppThemeExpander"
+                               Grid.Row="1"
+                               Margin="0,8,0,0"
+                               HorizontalAlignment="Stretch"
+                               VerticalAlignment="Top"
+                               HorizontalContentAlignment="Left"
+                               AutomationProperties.Name="{utils:ResourceString Name=AppThemeExpander/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
+                               ExpandDirection="Down"
+                               IsExpanded="False">
+                    <muxc:Expander.Header>
+                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
 
-                                <HyperlinkButton x:Name="AboutEULA"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutEULA/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
+                            <FontIcon Margin="0,0,12,0"
+                                      VerticalAlignment="Center"
+                                      Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                      FontFamily="{ThemeResource CalculatorFontFamily}"
+                                      FontSize="16"
+                                      Glyph="&#xE790;"/>
 
-                                <HyperlinkButton x:Name="AboutControlServicesAgreement"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutControlServicesAgreement/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
-
-                                <HyperlinkButton x:Name="AboutControlPrivacyStatement"
-                                                 Padding="0"
-                                                 NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
-                                                 ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
-                                    <TextBlock FontSize="{ThemeResource BodyFontSize}"
-                                               Text="{utils:ResourceString Name=AboutControlPrivacyStatement/Text}"
-                                               TextWrapping="Wrap"/>
-                                </HyperlinkButton>
+                            <StackPanel Grid.Column="1"
+                                        Margin="0,12"
+                                        Orientation="Vertical">
+                                <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{utils:ResourceString Name=SettingsAppThemeTitle/Text}"/>
+                                <TextBlock Style="{StaticResource CaptionTextBlockStyle}"
+                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                           Text="{utils:ResourceString Name=SettingsAppThemeDescription/Text}"
+                                           TextWrapping="WrapWholeWords"/>
                             </StackPanel>
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
+                        </Grid>
+                    </muxc:Expander.Header>
+                    <muxc:Expander.Content>
+                        <muxc:RadioButtons x:Name="ThemeRadioButtons"
+                                           Margin="32,0,0,0"
+                                           SelectionChanged="OnThemeSelectionChanged">
+                            <RadioButton x:Name="LightThemeRadioButton"
+                                         Content="{utils:ResourceString Name=LightThemeRadioButton/Content}"
+                                         Tag="Light"/>
+                            <RadioButton x:Name="DarkThemeRadioButton"
+                                         Content="{utils:ResourceString Name=DarkThemeRadioButton/Content}"
+                                         Tag="Dark"/>
+                            <RadioButton x:Name="SystemThemeRadioButton"
+                                         Content="{utils:ResourceString Name=SystemThemeRadioButton/Content}"
+                                         Tag="Default"/>
+                        </muxc:RadioButtons>
+                    </muxc:Expander.Content>
+                </muxc:Expander>
 
-                <HyperlinkButton x:Name="FeedbackButton"
-                                 MinWidth="120"
-                                 Margin="-12,4,0,0"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Top"
-                                 FontSize="{StaticResource BodyFontSize}"
-                                 Click="FeedbackButton_Click"
-                                 Content="{utils:ResourceString Name=FeedbackButton/Content}"/>
+                <Grid x:Name="AboutContentGrid" Grid.Row="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
 
-                <RichTextBlock x:Name="AboutContribute"
-                               Grid.Row="2"
-                               Margin="1,9,0,0"
-                               Style="{StaticResource SettingsRichTextBlockStyle}">
-                    <Paragraph>
-                        <!--
-                            Note: don't put Hyperlink element start to the next line
-                            otherwise unexpected whitespace will be add.
-                        -->
-                        <Run x:Name="ContributeRunBeforeLink"/><Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
-                                   NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
-                                   TextDecorations="None"
-                                   ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
-                                   UnderlineStyle="None">
-                            <Run x:Name="ContributeRunLink"/>
-                        </Hyperlink><Run x:Name="ContributeRunAfterLink"/>
-                    </Paragraph>
-                </RichTextBlock>
+                    <TextBlock x:Name="AboutGroupTitle"
+                               Margin="0,20,0,0"
+                               Style="{ThemeResource BodyStrongTextBlockStyle}"
+                               AutomationProperties.HeadingLevel="Level1"
+                               Text="{utils:ResourceString Name=AboutGroupTitle/Text}"/>
+                    <StackPanel Grid.Row="1"
+                                Margin="0,8,0,0"
+                                Orientation="Vertical">
+                        <RichTextBlock x:Name="AboutContentBody" Style="{StaticResource SettingsRichTextBlockStyle}">
+                            <Paragraph>
+                                <Run x:Name="AboutBuildVersion"/>
+                                <LineBreak/>
+                                <Run x:Name="AboutControlCopyrightRun"/>
+                            </Paragraph>
+                        </RichTextBlock>
 
-            </StackPanel>
+                        <HyperlinkButton x:Name="AboutEULA"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutEULA/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlServicesAgreement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutControlServicesAgreement/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlPrivacyStatement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
+                            <TextBlock FontSize="{ThemeResource BodyFontSize}"
+                                       Text="{utils:ResourceString Name=AboutControlPrivacyStatement/Text}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <Button x:Name="FeedbackButton"
+                                MinWidth="120"
+                                Margin="0,24,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                FontSize="{StaticResource BodyFontSize}"
+                                Click="FeedbackButton_Click"
+                                Content="{utils:ResourceString Name=FeedbackButton/Content}"/>
+                    </StackPanel>
+                    <RichTextBlock x:Name="AboutContribute"
+                                   Grid.Row="2"
+                                   Margin="0,16,0,0"
+                                   Style="{StaticResource SettingsRichTextBlockStyle}">
+                        <Paragraph>
+                            <!--
+                                Note: don't put Hyperlink element start to the next line
+                                otherwise unexpected whitespace will be add.
+                            -->
+                            <Run x:Name="ContributeRunBeforeLink"/>
+                            <Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
+                                       NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                       TextDecorations="None"
+                                       ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                       UnderlineStyle="None">
+                                <Run x:Name="ContributeRunLink"/>
+                            </Hyperlink>
+                            <Run x:Name="ContributeRunAfterLink"/>
+                        </Paragraph>
+                    </RichTextBlock>
+                </Grid>
+            </Grid>
         </ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/src/Calculator/Views/Settings.xaml.cs b/src/Calculator/Views/Settings.xaml.cs
index b68a8f6b..0889b09a 100644
--- a/src/Calculator/Views/Settings.xaml.cs
+++ b/src/Calculator/Views/Settings.xaml.cs
@@ -45,7 +45,7 @@ namespace CalculatorApp
 
             var copyrightText =
                 LocalizationStringUtil.GetLocalizedString(resourceLoader.GetResourceString("AboutControlCopyright"), BUILD_YEAR);
-            AboutExpander.Description = copyrightText;
+            AboutControlCopyrightRun.Text = copyrightText;
 
             InitializeContributeTextBlock();
         }
@@ -108,8 +108,8 @@ namespace CalculatorApp
         private void SetVersionString()
         {
             PackageVersion version = Package.Current.Id.Version;
-            AboutExpander.Header = AppResourceProvider.GetInstance().GetResourceString("AppName");
-            AboutBuildVersion.Text = version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
+            string appName = AppResourceProvider.GetInstance().GetResourceString("AppName");
+            AboutBuildVersion.Text = appName + " " + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
         }
 
         private void InitializeContributeTextBlock()
diff --git a/src/CalculatorUITests/StandardModeFunctionalTests.cs b/src/CalculatorUITests/StandardModeFunctionalTests.cs
index ae23efa2..e10c8245 100644
--- a/src/CalculatorUITests/StandardModeFunctionalTests.cs
+++ b/src/CalculatorUITests/StandardModeFunctionalTests.cs
@@ -316,8 +316,11 @@ namespace CalculatorUITests
             Assert.AreEqual("square (9)", page.CalculatorResults.GetCalculatorExpressionText()); //verifies squared hotkey
         }
 
+        // Ignore this test and add a new test KeyboardInput_PercentSquareRootBackspaceNegateOneZero below
+        // to avoid the issue of decimal keyboard input
         [TestMethod]
         [Priority(1)]
+        [Ignore]
         public void KeyboardInput_PercentSquareRootBackspaceDecimalNegateOneZero()
         {
             //Verifies the %, square root, backspace, decimal, negate, 1, and 0 button
@@ -345,6 +348,34 @@ namespace CalculatorUITests
             Assert.AreEqual("9.9", page.CalculatorResults.GetCalculatorResultText()); //verifies calculation with decimal point and negative number
         }
 
+        [TestMethod]
+        [Priority(1)]
+        public void KeyboardInput_PercentSquareRootBackspaceNegateOneZero()
+        {
+            //Verifies the %, square root, backspace, negate, 1, and 0 button
+            CalculatorApp.EnsureCalculatorHasFocus();
+            CalculatorApp.Window.SendKeys("100");
+            CalculatorApp.Window.SendKeys(Keys.Backspace);
+            Assert.AreEqual("10", page.CalculatorResults.GetCalculatorResultText()); // verifies using the 1 key, the 0 key, and the backspace key
+            CalculatorApp.Window.SendKeys(Keys.Add);
+            CalculatorApp.EnsureCalculatorHasFocus();
+            CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
+            Assert.AreEqual("1", page.CalculatorResults.GetCalculatorResultText()); //verifies percent calculation
+            Assert.AreEqual("10 + 1", page.CalculatorResults.GetCalculatorExpressionText()); //verifies percent hotkey
+            CalculatorApp.Window.SendKeys(Keys.Shift);
+            CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
+            CalculatorApp.Window.SendKeys(Keys.Shift);
+            CalculatorApp.Window.SendKeys(Keys.Shift + "2" + Keys.Shift);
+            Assert.AreEqual("0.3162277660168379", page.CalculatorResults.GetCalculatorResultText()); //verifies square root calculation
+            Assert.AreEqual("10 + √(0.1)", page.CalculatorResults.GetCalculatorExpressionText()); //verifies 2√x hotkey
+            CalculatorApp.Window.SendKeys("1");
+            CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
+            CalculatorApp.Window.SendKeys(Keys.F9);
+            Assert.AreEqual("-0.1", page.CalculatorResults.GetCalculatorResultText()); //verifies negate hotkey
+            page.StandardOperators.EqualButton.Click();
+            Assert.AreEqual("9.9", page.CalculatorResults.GetCalculatorResultText()); //verifies calculation with decimal point and negative number
+        }
+
         [TestMethod]
         [Priority(1)]
         public void KeyboardInput_MemoryHotkeys()