diff --git a/demo/Ursa.Demo/Views/MainWindow.axaml b/demo/Ursa.Demo/Views/MainWindow.axaml
index 6789bc6..d72ee64 100644
--- a/demo/Ursa.Demo/Views/MainWindow.axaml
+++ b/demo/Ursa.Demo/Views/MainWindow.axaml
@@ -15,8 +15,8 @@
     x:DataType="viewModels:MainWindowViewModel"
     WindowStartupLocation="CenterScreen"
     Icon="/Assets/Ursa.ico"
-    IsFullScreenButtonVisible="{OnPlatform True, macOS=False}"
-    IsManagedResizerVisible="{OnPlatform False, Linux=True}"
+    IsFullScreenButtonVisible="{OnPlatform {x:True}, macOS={x:False}}"
+    IsManagedResizerVisible="{OnPlatform {x:False}, Linux={x:True}}"
     mc:Ignorable="d">
     <u:UrsaWindow.RightContent>
         <views:TitleBarRightContent />
diff --git a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
index 3ba0f96..2dab5b9 100644
--- a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
@@ -11,39 +11,12 @@
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
-        <Setter Property="IsMinimizeButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
-        <Setter Property="IsRestoreButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
-        <Setter Property="IsCloseButtonVisible">
-            <OnPlatform>
-                <On Options="Default, Windows, Linux">
-                    <x:Boolean>True</x:Boolean>
-                </On>
-                <On Options="macOS">
-                    <x:Boolean>False</x:Boolean>
-                </On>
-            </OnPlatform>
-        </Setter>
+        <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
+        <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
+        <Setter Property="IsCloseButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}"/>
         <Setter Property="SystemDecorations">
             <OnPlatform>
-                <On Options="Default, Windows, macOS">
+                <On Options="Default">
                     <SystemDecorations>Full</SystemDecorations>
                 </On>
                 <On Options="Linux">