diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9ee4649..1973f6e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,12 +2,12 @@ name: Deploy to GitHub Pages
 
 env:
   PROJECT_PATH: demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
-  OUTPUT_PATH: demo/Ursa.Demo.Browser/bin/Release/net7.0/browser-wasm/AppBundle
+  OUTPUT_PATH: demo/Ursa.Demo.Browser/bin/Release/net8.0-browser/publish/wwwroot
 on:
   push:
-    branches: [ "deploy" ]
+    branches: [ "action/deploy" ]
   pull_request:
-    branches: [ "deploy" ]
+    branches: [ "action/deploy" ]
 
 jobs:
   deploy-to-github-pages:
@@ -16,19 +16,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.1
 
-      - name: Setup .NET 7
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.405
+          dotnet-version: 8.0.x
 
       - name: Install wasm-tools
-        run: dotnet workload install wasm-tools wasm-tools-net7
-
-      - name: Install DotNetCompress
-        run: dotnet tool install --global DotNetCompress --version 3.0.0 --no-cache
+        run: dotnet workload install wasm-tools
 
       - name: Publish .NET Project
-        run: dotnet publish $PROJECT_PATH -c Release -o release --nologo
+        run: dotnet publish $PROJECT_PATH -c Release --nologo
 
       - name: Change base-tag in index.html
         run: sed -i 's/<base href="\/" \/>/<base href="\/Ursa.Avalonia\/" \/>/g' $OUTPUT_PATH/index.html
@@ -36,12 +33,6 @@ jobs:
       - name: copy index.html to 404.html
         run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html
 
-      - name: Compress Output using Brotli
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format br --threads 4
-
-      - name: Compress Output using GZip
-        run: DotNetCompress -d $OUTPUT_PATH -p "*.dll" "*.js" "*.wasm" --format gz --threads 4
-
       - name: Add .nojekyll file
         run: touch $OUTPUT_PATH/.nojekyll
 
diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
new file mode 100644
index 0000000..619b807
--- /dev/null
+++ b/.github/workflows/pack.yml
@@ -0,0 +1,49 @@
+name: Pack
+
+on:
+  push:
+    branches: [ "action/pack" ]
+  pull_request:
+    branches: [ "action/pack" ]
+
+jobs:
+  nuget_desktop:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - name: Nuget
+        run: dotnet pack ./src/Ursa -o ./nugets
+
+      - name: Desktop
+        run: dotnet publish ./demo/Ursa.Demo.Desktop -r win-x64 -c Release /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained true
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: nuget_desktop
+          path: |
+            ./nugets
+            ./**/publish/*.exe
+
+  android:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - name: CD Android
+        run: cd ./demo/Ursa.Demo.Android
+
+      - name: Restore Dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet publish ./demo/Ursa.Demo.Android -c Release -f net8.0-android --no-restore
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: android
+          path: ./**/publish/*Signed.apk
diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index 3a82054..4832db9 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.10</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0-rc2</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj b/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
index 31ef39b..5860415 100644
--- a/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
+++ b/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
@@ -1,15 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-        <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0-browser</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <WasmExtraFilesToDeploy Include="AppBundle\**"/>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
diff --git a/demo/Ursa.Demo.Browser/AppBundle/Logo.svg b/demo/Ursa.Demo.Browser/wwwroot/Logo.svg
similarity index 100%
rename from demo/Ursa.Demo.Browser/AppBundle/Logo.svg
rename to demo/Ursa.Demo.Browser/wwwroot/Logo.svg
diff --git a/demo/Ursa.Demo.Browser/AppBundle/app.css b/demo/Ursa.Demo.Browser/wwwroot/app.css
similarity index 100%
rename from demo/Ursa.Demo.Browser/AppBundle/app.css
rename to demo/Ursa.Demo.Browser/wwwroot/app.css
diff --git a/demo/Ursa.Demo.Browser/AppBundle/favicon.ico b/demo/Ursa.Demo.Browser/wwwroot/favicon.ico
similarity index 100%
rename from demo/Ursa.Demo.Browser/AppBundle/favicon.ico
rename to demo/Ursa.Demo.Browser/wwwroot/favicon.ico
diff --git a/demo/Ursa.Demo.Browser/AppBundle/index.html b/demo/Ursa.Demo.Browser/wwwroot/index.html
similarity index 86%
rename from demo/Ursa.Demo.Browser/AppBundle/index.html
rename to demo/Ursa.Demo.Browser/wwwroot/index.html
index 184f7ca..1c9e22f 100644
--- a/demo/Ursa.Demo.Browser/AppBundle/index.html
+++ b/demo/Ursa.Demo.Browser/wwwroot/index.html
@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./dotnet.js" />
-    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 
diff --git a/demo/Ursa.Demo.Browser/AppBundle/main.js b/demo/Ursa.Demo.Browser/wwwroot/main.js
similarity index 69%
rename from demo/Ursa.Demo.Browser/AppBundle/main.js
rename to demo/Ursa.Demo.Browser/wwwroot/main.js
index 0dbe2e4..2af82e9 100644
--- a/demo/Ursa.Demo.Browser/AppBundle/main.js
+++ b/demo/Ursa.Demo.Browser/wwwroot/main.js
@@ -1,4 +1,4 @@
-import { dotnet } from './dotnet.js'
+import { dotnet } from './_framework/dotnet.js'
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
\ No newline at end of file
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 2f2aa53..e95fe55 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -19,7 +19,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-        <PackageReference Include="Semi.Avalonia" Version="11.0.7" />
+        <PackageReference Include="Semi.Avalonia" Version="11.1.0-rc2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index 45b0934..231dd0d 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -36,7 +36,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "Message Box", Key = MenuKeys.MenuKeyMessageBox },
             new() { MenuHeader = "MultiComboBox", Key = MenuKeys.MenuKeyMultiComboBox, Status = "Updated" },
             new() { MenuHeader = "Nav Menu", Key = MenuKeys.MenuKeyNavMenu },
-            // new() { MenuHeader = "Number Displayer", Key = MenuKeys.MenuKeyNumberDisplayer, Status = "New" }, 
+            new() { MenuHeader = "Number Displayer", Key = MenuKeys.MenuKeyNumberDisplayer, Status = "New" }, 
             new() { MenuHeader = "Numeric UpDown", Key = MenuKeys.MenuKeyNumericUpDown },
             new() { MenuHeader = "NumPad", Key = MenuKeys.MenuKeyNumPad },
             new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
diff --git a/src/Package.props b/src/Package.props
index 0567ced..de51260 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <AvaloniaVersion>11.1.0-rc2</AvaloniaVersion>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 33813af..ad58ead 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -71,10 +71,10 @@
                                 MaxHeight="300"
                                 HorizontalScrollBarVisibility="Disabled"
                                 VerticalScrollBarVisibility="Auto">
-                                <TextBlock
+                                <ContentPresenter
                                     Name="PART_ContentPresenter"
                                     VerticalAlignment="Center"
-                                    Text="{TemplateBinding Content}"
+                                    Content="{TemplateBinding Content}"
                                     TextAlignment="Left"
                                     TextWrapping="Wrap" />
                             </ScrollViewer>
@@ -203,10 +203,10 @@
                                     MaxHeight="300"
                                     HorizontalScrollBarVisibility="Disabled"
                                     VerticalScrollBarVisibility="Auto">
-                                    <TextBlock
+                                    <ContentPresenter
                                         Name="PART_ContentPresenter"
                                         VerticalAlignment="Center"
-                                        Text="{TemplateBinding Content}"
+                                        Content="{TemplateBinding Content}"
                                         TextAlignment="Left"
                                         TextWrapping="Wrap" />
                                 </ScrollViewer>
diff --git a/src/Ursa/Ursa.csproj b/src/Ursa/Ursa.csproj
index 09dc72a..e21f099 100644
--- a/src/Ursa/Ursa.csproj
+++ b/src/Ursa/Ursa.csproj
@@ -23,9 +23,4 @@
     <ItemGroup>
         <None Include="irihi.png" Pack="true" PackagePath=""/>
     </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Controls\Panels\" />
-    </ItemGroup>
-
 </Project>