diff --git a/.gitmodules b/.gitmodules
index 629f195..63acddc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "Glitonea"]
 	path = Glitonea
-	url = https://github.com/Ciastex/Glitonea
+	url = https://github.com/vddCore/Glitonea
diff --git a/Glitonea b/Glitonea
index 132a10d..5e9a57c 160000
--- a/Glitonea
+++ b/Glitonea
@@ -1 +1 @@
-Subproject commit 132a10de55d6ef4f16abc5daab6179d2e9cad5ee
+Subproject commit 5e9a57c6014dc3776199121548fd4977ba923393
diff --git a/Saradomin.sln.DotSettings.user b/Saradomin.sln.DotSettings.user
index 270c758..33c6819 100644
--- a/Saradomin.sln.DotSettings.user
+++ b/Saradomin.sln.DotSettings.user
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	
-	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">/usr/share/dotnet/sdk/7.0.100/MSBuild.dll</s:String>
+	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">C:\Program Files\dotnet\sdk\7.0.201\MSBuild.dll</s:String>
+	<s:Int64 x:Key="/Default/Environment/Hierarchy/Build/BuildTool/MsbuildVersion/@EntryValue">4294967293</s:Int64>
 	<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">No</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Saradomin/App.axaml b/Saradomin/App.axaml
index a9fd21a..610c228 100644
--- a/Saradomin/App.axaml
+++ b/Saradomin/App.axaml
@@ -1,8 +1,7 @@
 <Application x:Class="Saradomin.App"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:Saradomin.View.Controls"
-             xmlns:default="clr-namespace:Avalonia.Themes.Default;assembly=Avalonia.Themes.Default">
+             xmlns:controls="clr-namespace:Saradomin.View.Controls">
     <Application.Resources>
         <Color x:Key="DarkBackgroundColor">#3E3529</Color>
         <Color x:Key="DarkTranslucentBackgroundColor">#CC3E3529</Color>
@@ -93,8 +92,7 @@
     </Application.Resources>
 
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
+        <SimpleTheme />
 
         <StyleInclude Source="avares://Saradomin/Resources/Styles/TopBarNavigation.axaml" />
         <StyleInclude Source="avares://Saradomin/Resources/Styles/CloseButton.axaml" />
diff --git a/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs b/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs
deleted file mode 100644
index d67fe32..0000000
--- a/Saradomin/Infrastructure/Messaging/MainViewLoadedMessage.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class MainViewLoadedMessage : Message
-    {
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/Messages.cs b/Saradomin/Infrastructure/Messaging/Messages.cs
new file mode 100644
index 0000000..3301c80
--- /dev/null
+++ b/Saradomin/Infrastructure/Messaging/Messages.cs
@@ -0,0 +1,8 @@
+using Glitonea.Mvvm.Messaging;
+
+namespace Saradomin.Infrastructure.Messaging
+{
+    public sealed record MainViewLoadedMessage : Message;
+    public sealed record NotificationBoxStateChangedMessage(bool WasOpened) : Message;
+    public sealed record SettingsModifiedMessage(string SettingName) : Message;
+}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs b/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs
deleted file mode 100644
index e769deb..0000000
--- a/Saradomin/Infrastructure/Messaging/NotificationBoxStateChangedMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class NotificationBoxStateChangedMessage : Message
-    {
-        public bool WasOpened { get; }
-
-        public NotificationBoxStateChangedMessage(bool wasOpened)
-        {
-            WasOpened = wasOpened;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs b/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs
deleted file mode 100644
index 896c9f8..0000000
--- a/Saradomin/Infrastructure/Messaging/SettingsModifiedMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Glitonea.Mvvm.Messaging;
-
-namespace Saradomin.Infrastructure.Messaging
-{
-    public class SettingsModifiedMessage : Message
-    {
-        public string SettingName { get; }
-
-        public SettingsModifiedMessage(string settingName)
-        {
-            SettingName = settingName;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Saradomin/Resources/Styles/CheckBox.axaml b/Saradomin/Resources/Styles/CheckBox.axaml
index 7466129..0940940 100644
--- a/Saradomin/Resources/Styles/CheckBox.axaml
+++ b/Saradomin/Resources/Styles/CheckBox.axaml
@@ -16,8 +16,8 @@
                     </Canvas>
                     
                     <ContentPresenter Grid.Column="1" 
-                                      TextBlock.Foreground="{TemplateBinding Foreground}"
-                                      TextBlock.FontSize="13"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      TextElement.FontSize="13"
                                       Margin="2,0,0,0"
                                       ContentTemplate="{TemplateBinding ContentTemplate}"
                                       Content="{TemplateBinding Content}"
@@ -45,8 +45,8 @@
                     </Canvas>
                     
                     <ContentPresenter Grid.Column="1" 
-                                      TextBlock.Foreground="{TemplateBinding Foreground}"
-                                      TextBlock.FontSize="13"
+                                      TextElement.Foreground="{TemplateBinding Foreground}"
+                                      TextElement.FontSize="13"
                                       Margin="2,0,0,0"
                                       ContentTemplate="{TemplateBinding ContentTemplate}"
                                       Content="{TemplateBinding Content}"
diff --git a/Saradomin/Resources/Styles/RadioButton.axaml b/Saradomin/Resources/Styles/RadioButton.axaml
index 04f4c40..434849b 100644
--- a/Saradomin/Resources/Styles/RadioButton.axaml
+++ b/Saradomin/Resources/Styles/RadioButton.axaml
@@ -21,8 +21,8 @@
                                       Content="{TemplateBinding Content}"
                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      TextBlock.FontSize="13"
-                                      TextBlock.Foreground="{TemplateBinding Foreground}" />
+                                      TextElement.FontSize="13"
+                                      TextElement.Foreground="{TemplateBinding Foreground}" />
                 </Grid>
             </ControlTemplate>
         </Setter>
@@ -49,8 +49,8 @@
                                       Content="{TemplateBinding Content}"
                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      TextBlock.FontSize="13"
-                                      TextBlock.Foreground="{TemplateBinding Foreground}" />
+                                      TextElement.FontSize="13"
+                                      TextElement.Foreground="{TemplateBinding Foreground}" />
                 </Grid>
             </ControlTemplate>
         </Setter>
diff --git a/Saradomin/Saradomin.csproj b/Saradomin/Saradomin.csproj
index d3e6572..cc14072 100644
--- a/Saradomin/Saradomin.csproj
+++ b/Saradomin/Saradomin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Version>1.5.1</Version>
     </PropertyGroup>
 
@@ -11,19 +11,21 @@
         <PublishSingleFile>true</PublishSingleFile>
         <PublishReadyToRun>true</PublishReadyToRun>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-
+        <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
+        <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
         <NoWarn>IL2026;CS0067</NoWarn>
 
         <ApplicationIcon>Resources\Icons\saradomin.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.18" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-rc1.1" />
         <PackageReference Include="GitLabApiClient" Version="1.8.0" />
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.48" />
         <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
         <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     </ItemGroup>
diff --git a/Saradomin/View/Controls/PluginManagerView.axaml b/Saradomin/View/Controls/PluginManagerView.axaml
index e70a3fd..6d9d0f6 100644
--- a/Saradomin/View/Controls/PluginManagerView.axaml
+++ b/Saradomin/View/Controls/PluginManagerView.axaml
@@ -32,7 +32,7 @@
 
 
                             <ListBox Classes="PluginList"
-                                     Items="{Binding LocalPlugins}"
+                                     ItemsSource="{Binding LocalPlugins}"
                                      SelectionMode="Single">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate DataType="{x:Type model:PluginInfo}">
@@ -91,7 +91,7 @@
                                       HorizontalScrollBarVisibility="Hidden"
                                       VerticalScrollBarVisibility="Visible">
                             <ListBox Classes="PluginList"
-                                     Items="{Binding RemotePlugins}"
+                                     ItemsSource="{Binding RemotePlugins}"
                                      SelectionMode="Single">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate DataType="{x:Type model:PluginInfo}">
diff --git a/Saradomin/View/Controls/PluginManagerView.axaml.cs b/Saradomin/View/Controls/PluginManagerView.axaml.cs
index 45e2d9f..5e2da5a 100644
--- a/Saradomin/View/Controls/PluginManagerView.axaml.cs
+++ b/Saradomin/View/Controls/PluginManagerView.axaml.cs
@@ -6,7 +6,7 @@ using PropertyChanged;
 namespace Saradomin.View.Controls
 {
     [DoNotNotify]
-    public class PluginManagerView : UserControl
+    public partial class PluginManagerView : UserControl
     {
         public PluginManagerView()
         {
diff --git a/Saradomin/View/Controls/SettingsView.axaml b/Saradomin/View/Controls/SettingsView.axaml
index ba6e030..327ca33 100644
--- a/Saradomin/View/Controls/SettingsView.axaml
+++ b/Saradomin/View/Controls/SettingsView.axaml
@@ -103,7 +103,7 @@
 
                         <ComboBox Grid.Row="1"
                                   Margin="2,0,0,2"
-                                  Items="{Binding ServerProfiles}"
+                                  ItemsSource="{Binding ServerProfiles}"
                                   SelectedItem="{Binding ServerProfile, Converter={StaticResource EnumDescriptionConverter}, Mode=TwoWay}">
                             <ComboBox.Styles>
                                 <Style Selector="ComboBoxItem">
diff --git a/Saradomin/View/Controls/SettingsView.axaml.cs b/Saradomin/View/Controls/SettingsView.axaml.cs
index 788d904..80aabab 100644
--- a/Saradomin/View/Controls/SettingsView.axaml.cs
+++ b/Saradomin/View/Controls/SettingsView.axaml.cs
@@ -5,7 +5,7 @@ using PropertyChanged;
 namespace Saradomin.View.Controls
 {
     [DoNotNotify]
-    public class SettingsView : UserControl
+    public partial class SettingsView : UserControl
     {
         public SettingsView()
         {
diff --git a/Saradomin/View/Windows/MainWindow.axaml b/Saradomin/View/Windows/MainWindow.axaml
index 68360cc..d49436f 100644
--- a/Saradomin/View/Windows/MainWindow.axaml
+++ b/Saradomin/View/Windows/MainWindow.axaml
@@ -2,10 +2,9 @@
                    xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:controls="clr-namespace:Saradomin.View.Controls"
-                   xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea"
+                   xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
                    xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
                    xmlns:vm="clr-namespace:Saradomin.ViewModel.Windows"
-                   Name="MainWindow"
                    Title="{Binding Title}"
                    Width="800"
                    Height="550"
@@ -43,7 +42,7 @@
                                FontSize="14"
                                FontWeight="Light"
                                Foreground="{StaticResource AccentBrush}"
-                               Text="{Binding #MainWindow.Title}"
+                               Text="{Binding $parent[Window].Title}"
                                TextAlignment="Center" />
 
                     <Button Grid.Column="2"
@@ -144,4 +143,4 @@
             </Grid>
         </Border>
     </Grid>
-</glitonea:WindowEx>
+</glitonea:WindowEx>
\ No newline at end of file
diff --git a/Saradomin/View/Windows/MainWindow.axaml.cs b/Saradomin/View/Windows/MainWindow.axaml.cs
index bbd9efb..e8fcc1a 100644
--- a/Saradomin/View/Windows/MainWindow.axaml.cs
+++ b/Saradomin/View/Windows/MainWindow.axaml.cs
@@ -10,7 +10,7 @@ using Saradomin.Infrastructure.Messaging;
 namespace Saradomin.View.Windows
 {
     [DoNotNotify]
-    public class MainWindow : Window
+    public partial class MainWindow : Window
     {
         public MainWindow()
         {
diff --git a/Saradomin/View/Windows/NotificationBox.axaml b/Saradomin/View/Windows/NotificationBox.axaml
index 335bc01..4748edd 100644
--- a/Saradomin/View/Windows/NotificationBox.axaml
+++ b/Saradomin/View/Windows/NotificationBox.axaml
@@ -1,16 +1,15 @@
 <glitonea:WindowEx x:Class="Saradomin.View.Windows.NotificationBox"
                    xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                   xmlns:glitonea="clr-namespace:Glitonea;assembly=Glitonea"
+                   xmlns:glitonea="clr-namespace:Glitonea.Controls;assembly=Glitonea"
                    xmlns:mvvm="clr-namespace:Glitonea.Mvvm;assembly=Glitonea"
                    xmlns:windows="clr-namespace:Saradomin.ViewModel.Windows"
-                   Name="NotificationBox"
                    Title="{Binding Title}"
                    Height="120"
                    MaxWidth="400"
                    Background="{StaticResource WindowBackgroundBrush}"
                    CanResize="False"
-                   DataContext="{Binding #NotificationBox}"
+                   DataContext="{Binding}"
                    ShowActivated="True"
                    ShowInTaskbar="False"
                    SizeToContent="WidthAndHeight"
@@ -26,7 +25,7 @@
                            FontSize="14"
                            FontWeight="Light"
                            Foreground="{StaticResource AccentBrush}"
-                           Text="{Binding #NotificationBox.Title}"
+                           Text="{Binding $parent[Window].Title}"
                            TextAlignment="Center">
                 </TextBlock>
             </Grid>
diff --git a/Saradomin/View/Windows/NotificationBox.axaml.cs b/Saradomin/View/Windows/NotificationBox.axaml.cs
index edf5863..252ed01 100644
--- a/Saradomin/View/Windows/NotificationBox.axaml.cs
+++ b/Saradomin/View/Windows/NotificationBox.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Glitonea;
+using Glitonea.Controls;
 using Glitonea.Extensions;
 using PropertyChanged;
 using Saradomin.Infrastructure.Messaging;
@@ -11,19 +12,16 @@ using Saradomin.Infrastructure.Messaging;
 namespace Saradomin.View.Windows
 {
     [DoNotNotify]
-    public class NotificationBox : WindowEx
+    public partial class NotificationBox : WindowEx
     {
         private static Queue<NotificationBox> _notificationQueue = new();
         
         public static NotificationBox Current { get; private set; }
-        
-        public static readonly StyledProperty<string> MessageProperty = new(
-            nameof(Message), 
-            typeof(NotificationBox),
-            new StyledPropertyMetadata<string>(
-                "This is supposed to be a message.\n" +
-                "Someone messed up, though, so have this placeholder instead."
-            )
+
+        public static readonly StyledProperty<string> MessageProperty = AvaloniaProperty.Register<NotificationBox, string>(
+            nameof(Message),
+            "This is supposed to be a message.\n" +
+            "Someone messed up, though, so have this placeholder instead."
         );
 
         public string Message
@@ -48,7 +46,7 @@ namespace Saradomin.View.Windows
             => DisplayNotification("Notification", message);
 
         public static void DisplayNotification(string title, string message)
-            => DisplayNotification(title, message, Application.Current.GetMainWindow());
+            => DisplayNotification(title, message, Application.Current!.GetMainWindow());
 
         public static void DisplayNotification(string title, string message, Window owner)
         {
@@ -82,7 +80,8 @@ namespace Saradomin.View.Windows
             if (_notificationQueue.Any())
             {
                 Current = _notificationQueue.Dequeue();
-                Current.ShowDialog(Current.Owner as Window);
+                Current.ShowDialog((Window)Current.Owner!);
+                
                 new NotificationBoxStateChangedMessage(true)
                     .Broadcast();
             }
diff --git a/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs b/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
index 930a727..eb00267 100644
--- a/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
+++ b/Saradomin/ViewModel/Controls/PluginManagerViewModel.cs
@@ -56,8 +56,11 @@ namespace Saradomin.ViewModel.Controls
             );
         }
 
-        public async Task InstallRemotePlugin(PluginInfo pluginInfo)
+        public async Task InstallRemotePlugin(object parameter)
         {
+            if (parameter is not PluginInfo pluginInfo)
+                return;
+            
             if (IsTransactionInProgress)
                 return;
 
@@ -88,8 +91,11 @@ namespace Saradomin.ViewModel.Controls
             }
         }
 
-        public async Task UninstallLocalPlugin(PluginInfo pluginInfo)
+        public async Task UninstallLocalPlugin(object parameter)
         {
+            if (parameter is not PluginInfo pluginInfo)
+                return;
+            
             if (IsTransactionInProgress)
                 return;
 
diff --git a/Saradomin/ViewModel/Controls/SettingsViewModel.cs b/Saradomin/ViewModel/Controls/SettingsViewModel.cs
index 4384d41..83ef02a 100644
--- a/Saradomin/ViewModel/Controls/SettingsViewModel.cs
+++ b/Saradomin/ViewModel/Controls/SettingsViewModel.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Glitonea.Extensions;
 using Glitonea.Mvvm;
 using Glitonea.Mvvm.Messaging;
@@ -76,61 +78,68 @@ namespace Saradomin.ViewModel.Controls
         {
             _settingsService = settingsService;
 
-           Message.Subscribe<MainViewLoadedMessage>(this, OnMainViewLoaded);
+            Message.Subscribe<MainViewLoadedMessage>(this, OnMainViewLoaded);
         }
 
-        private void LaunchScapeWebsite()
+        public void LaunchScapeWebsite()
         {
             CrossPlatform.LaunchURL("https://2009scape.org");
         }
 
-        private void OpenPluginTutorial()
+        public void OpenPluginTutorial()
         {
             CrossPlatform.LaunchURL("https://gitlab.com/2009scape/tools/client-plugins");
         }
 
-        private void LaunchProjectWebsite()
+        public void LaunchProjectWebsite()
         {
             CrossPlatform.LaunchURL("https://gitlab.com/2009scape/Saradomin-Launcher");
         }
 
-        private void OnMainViewLoaded(MainViewLoadedMessage _)
+        public void OnMainViewLoaded(MainViewLoadedMessage _)
         {
             Message.Subscribe<SettingsModifiedMessage>(this, OnSettingsModified);
         }
 
-        private void OnSettingsModified(SettingsModifiedMessage _)
+        public void OnSettingsModified(SettingsModifiedMessage _)
         {
             _settingsService.SaveAll();
         }
 
-        private async Task BrowseForJavaExecutable()
+        public async Task BrowseForJavaExecutable()
         {
-            var ofd = new OpenFileDialog
+            var storageProvider = Application.Current!.GetMainWindow()!.StorageProvider;
+
+            var storageFile = (await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 Title = "Browse for Java...",
                 AllowMultiple = false,
-                Directory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
-            };
+                SuggestedStartLocation = await storageProvider.TryGetFolderFromPathAsync(
+                    Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)
+                )
+            })).FirstOrDefault();
 
-            var paths = await ofd.ShowAsync(Application.Current.GetMainWindow());
-
-            if (paths != null && paths.Length > 0)
+            if (storageFile != null)
             {
-                Launcher.JavaExecutableLocation = paths[0];
+                Launcher.JavaExecutableLocation = storageFile.TryGetLocalPath();
             }
         }
-        
-        private async Task BrowseForInstallationDirectory()
+
+        public async Task BrowseForInstallationDirectory()
         {
-            var ofd = new OpenFolderDialog
+            var storageProvider = Application.Current!.GetMainWindow()!.StorageProvider;
+            
+            var storageFolder = (await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
             {
                 Title = "Browse for Installation Directory...",
-                Directory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
-            };
-
-            var path = await ofd.ShowAsync(Application.Current.GetMainWindow());
+                AllowMultiple = false,
+                SuggestedStartLocation = await storageProvider.TryGetFolderFromPathAsync(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
+                )
+            })).FirstOrDefault();
 
+            var path = storageFolder?.TryGetLocalPath();
+            
             if (path != null)
             {
                 if (CrossPlatform.IsDirectoryWritable(path))
diff --git a/Saradomin/ViewModel/Windows/MainWindowViewModel.cs b/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
index dbff8bd..1dee1e9 100644
--- a/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
+++ b/Saradomin/ViewModel/Windows/MainWindowViewModel.cs
@@ -119,7 +119,7 @@ namespace Saradomin.ViewModel.Windows
             DimContent = msg.WasOpened;
         }
 
-        public void LaunchPage(string parameter)
+        public void LaunchPage(object parameter)
         {
             var url = parameter switch
             {