diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index b0ea723..7d912bb 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.0-beta2</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0-rc1</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
index ecdaeb6..23b2602 100644
--- a/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
@@ -11,13 +11,36 @@
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
-        <!--
-        <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-
-        <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-        
-        <Setter Property="IsCloseButtonVisible" Value="{OnPlatform Default=True, Windows=True, Linux=True, macOS=False}" />
-        -->
+        <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="SystemDecorations">
             <OnPlatform>
                 <On Options="Default, Windows, macOS">