diff --git a/Directory.Build.props b/Directory.Build.props
index 31a7bf2b..c61df258 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,7 @@
         <Authors>https://github.com/jinek/Consolonia/graphs/contributors</Authors>
         <Description>Text User Interface implementation of Avalonia UI (GUI Framework)</Description>
         <Copyright>Copyright © Evgeny Gorbovoy 2021 - 2022</Copyright>
+        <NoWarn>AVA3001</NoWarn>
     </PropertyGroup>
     <PropertyGroup>
         <AvaloniaVersion>11.0.9</AvaloniaVersion>
diff --git a/src/.editorconfig b/src/.editorconfig
index 45b7f78a..dc887c0f 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -74,6 +74,7 @@ dotnet_diagnostic.ca1043.severity = none # todo: why not to use indexer rather t
 dotnet_diagnostic.ca1814.severity = none # sometimes we need rectangle array
 dotnet_diagnostic.ca1058.severity = none # check why new documentation warns not to derive from ApplicationException. The purpose of last is to distinguish system exceptions like OOM, AssemblyLoadException etc from application logic
 dotnet_diagnostic.ca2000.severity = none # exceptions which are listed in the rule can be applied to any type
+dotnet_diagnostic.CA2007.severity = none # we are assuming task continuation thread is fine by default
 dotnet_diagnostic.ca2213.severity = none # keeping field does not mean necessarity to dispose - it can be dispose somwhere else
 dotnet_diagnostic.ca2248.severity = none # https://github.com/dotnet/roslyn-analyzers/issues/4432
 dotnet_diagnostic.ca1062.severity = none # we are fine with NRE - no need for additional checks
diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 00b7142a..d059e8af 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -1,15 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />    
+    <ItemGroup>
+        <AvaloniaXaml Remove="Controls\FileOpen\**" />
+        <Compile Remove="Controls\FileOpen\**" />
+        <EmbeddedResource Remove="Controls\FileOpen\**" />
+        <None Remove="Controls\FileOpen\**" />
+    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.FreeDesktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
         <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
         <PackageReference Include="Unicode.net" Version="2.0.0" />
         <PackageReference Include="Wcwidth" Version="2.0.0" />
     </ItemGroup>
 
+
 </Project>
- 
\ No newline at end of file
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs b/src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
similarity index 98%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs
rename to src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
index a7407024..80f6a80c 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogHelpers.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogHelpers.cs
@@ -11,7 +11,7 @@
 using Avalonia.VisualTree;
 using Consolonia.Core.Helpers;
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls.Dialog
+namespace Consolonia.Core.Controls.Dialog
 {
     public class DialogHost
     {
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
similarity index 90%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml
rename to src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
index 49501ce7..89fcd51e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:drawing1="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
-             x:Class="Consolonia.Themes.TurboVision.Templates.Controls.DialogWrap">
+             x:Class="Consolonia.Core.Controls.Dialog.DialogWrap">
 
     <Panel>
         <Border Background="{drawing1:ConsoleBrush Mode=Shaded}"
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
similarity index 89%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs
rename to src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
index f196c29a..45e8b518 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWrap.axaml.cs
+++ b/src/Consolonia.Core/Controls/Dialog/DialogWrap.axaml.cs
@@ -4,12 +4,10 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
 using Avalonia.Reactive;
 using Avalonia.VisualTree;
-using Consolonia.Themes.TurboVision.Templates.Controls.Dialog;
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls
+namespace Consolonia.Core.Controls.Dialog
 {
     [SuppressMessage("Usage", "PartialTypeWithSinglePart",
         Justification = "Partial class required for XAML code generation.")]
@@ -52,11 +50,6 @@ private void SetNewSize(Size newSize)
             Height = newSize.Height;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public void SetContent(DialogWindow dialogWindow)
         {
             FoundContentPresenter.Content = dialogWindow;
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs b/src/Consolonia.Core/Controls/DialogWindow.cs
similarity index 51%
rename from src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs
rename to src/Consolonia.Core/Controls/DialogWindow.cs
index e9fb484e..c8a22918 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Dialog/DialogWindow.cs
+++ b/src/Consolonia.Core/Controls/DialogWindow.cs
@@ -8,10 +8,11 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.VisualTree;
+using Consolonia.Core.Controls.Dialog;
 
 // ReSharper disable MemberCanBeProtected.Global
 
-namespace Consolonia.Themes.TurboVision.Templates.Controls.Dialog
+namespace Consolonia.Core.Controls
 {
     [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
     public class DialogWindow : UserControl
@@ -24,10 +25,20 @@ public class DialogWindow : UserControl
         public static readonly StyledProperty<bool> IsCloseButtonVisibleProperty =
             AvaloniaProperty.Register<DialogWindow, bool>(nameof(IsCloseButtonVisible), true);
 
+        public static readonly StyledProperty<WindowStartupLocation> WindowStartupLocationProperty =
+            AvaloniaProperty.Register<DialogWindow, WindowStartupLocation>(nameof(WindowStartupLocation));
+
+        public static readonly StyledProperty<bool> CanResizeProperty =
+            AvaloniaProperty.Register<DialogWindow, bool>(nameof(CanResize), true);
+
+        public static readonly StyledProperty<string> IconProperty =
+            AvaloniaProperty.Register<DialogWindow, string>(nameof(Icon));
+
         private Size _contentSize;
         private ContentPresenter _partContentPresenter;
 
-        private TaskCompletionSource _taskCompletionSource;
+        private TaskCompletionSource<object> _taskCompletionSource;
+
 
         static DialogWindow()
         {
@@ -61,6 +72,43 @@ public bool IsCloseButtonVisible
         // ReSharper disable once MemberCanBePrivate.Global
         public bool CancelOnEscape { get; set; } = true;
 
+
+        /// <summary>
+        ///     Enables or disables resizing of the window.
+        /// </summary>
+        public bool CanResize
+        {
+            get => GetValue(CanResizeProperty);
+            set => SetValue(CanResizeProperty, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the icon of the window.
+        /// </summary>
+        public string Icon
+        {
+            get => GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the startup location of the window.
+        /// </summary>
+        public WindowStartupLocation WindowStartupLocation
+        {
+            get => GetValue(WindowStartupLocationProperty);
+            set => SetValue(WindowStartupLocationProperty, value);
+        }
+
+        /// <summary>
+        ///     Gets or sets the window position in screen coordinates.
+        /// </summary>
+        //public PixelPoint Position
+        //{
+        //    get => PlatformImpl?.Position ?? PixelPoint.Origin;
+        //    set => PlatformImpl?.Move(value);
+        //}
+
         // ReSharper disable once UnusedMember.Global Used by template
         public void CloseClick()
         {
@@ -83,31 +131,60 @@ protected override Size ArrangeOverride(Size finalSize)
             return arrangeOverride;
         }
 
-        private void ShowDialogInternal(Visual parent)
+        protected void ShowDialogInternal(Visual parent)
         {
+            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            {
+                Width = (ushort)(parent.Bounds.Width * .9);
+                Height = (ushort)(parent.Bounds.Height * .9);
+                if (parent is Window window) window.SizeChanged += Window_SizeChanged;
+            }
+
             DialogHost dialogHost = GetDialogHost(parent);
             dialogHost.OpenInternal(this);
         }
 
+        private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            var window = (Window)sender;
+            if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
+            {
+                Width = (ushort)(window.Bounds.Width * .9);
+                Height = (ushort)(window.Bounds.Height * .9);
+            }
+        }
+
         // ReSharper disable once VirtualMemberNeverOverridden.Global overriden in other packages, why resharper suggests this?
-        public virtual void CloseDialog()
+        public virtual void CloseDialog(object result = null)
         {
             DialogHost dialogHost = GetDialogHost(this);
             dialogHost.PopInternal(this);
-            _taskCompletionSource.SetResult();
+            if (Parent is Window window) window.SizeChanged -= Window_SizeChanged;
+            _taskCompletionSource.SetResult(result);
+        }
+
+        public async Task ShowDialogAsync(Control parent)
+        {
+            if (_taskCompletionSource != null)
+                throw new InvalidOperationException("Dialog is already shown.");
+
+            _taskCompletionSource = new TaskCompletionSource<object>();
+            ShowDialogInternal(parent);
+            await _taskCompletionSource.Task;
         }
 
-        public Task ShowDialogAsync(Control parent)
+        public async Task<T> ShowDialogAsync<T>(Control parent)
         {
             if (_taskCompletionSource != null)
-                throw new NotImplementedException();
+                throw new InvalidOperationException("Dialog is already shown.");
 
-            _taskCompletionSource = new TaskCompletionSource();
+            _taskCompletionSource = new TaskCompletionSource<object>();
             ShowDialogInternal(parent);
-            return _taskCompletionSource.Task;
+            object result = await _taskCompletionSource.Task;
+            return (T)result;
         }
 
-        private static DialogHost GetDialogHost(Visual parent)
+        protected static DialogHost GetDialogHost(Visual parent)
         {
             var window = parent.FindAncestorOfType<Window>(true);
             DialogHost dialogHost = window!.GetValue(DialogHost.DialogHostProperty);
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
new file mode 100644
index 00000000..33fbc7ad
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml
@@ -0,0 +1,69 @@
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FileOpenPickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FileOpenPicker"
+                       Icon="📰"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
+    <Grid RowDefinitions="Auto * Auto Auto">
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁 " />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
+        </Grid>
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged"
+                 DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <ComboBox Grid.Row="2"
+                  ItemsSource="{Binding Options.FileTypeFilter}"
+                  SelectedIndex="{Binding SelectedFilterIndex}"
+                  HorizontalAlignment="Right">
+            <ComboBox.ItemTemplate>
+                <DataTemplate DataType="{x:Type storage:FilePickerFileType}">
+                    <TextBlock Text="{Binding Name}"
+                               HorizontalAlignment="Stretch" />
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="OkButton"
+                    Content="OK"
+                    Click="OnOK"
+                    IsEnabled="{Binding HasSelection}" />
+            <Button x:Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
+        </StackPanel>
+    </Grid>
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
new file mode 100644
index 00000000..d8fec347
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -0,0 +1,83 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileOpenPicker : DialogWindow
+    {
+        public FileOpenPicker()
+            : this(new FilePickerOpenOptions())
+        {
+        }
+
+        public FileOpenPicker(FilePickerOpenOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            DataContext = new FileOpenPickerViewModel(options);
+            InitializeComponent();
+            CancelButton.Focus();
+        }
+
+        /// <summary>
+        ///     Gets the view model associated with this picker.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
+        private FileOpenPickerViewModel ViewModel =>
+            DataContext as FileOpenPickerViewModel
+            ?? throw new InvalidOperationException("DataContext is not properly initialized.");
+
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is IStorageFolder folder)
+            {
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.SelectedFiles.Clear();
+            }
+            else if (listbox.SelectedItem is IStorageFile file)
+            {
+                CloseDialog(new[] { file });
+            }
+        }
+
+        private void OnOK(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(ViewModel.SelectedFiles);
+        }
+
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            CloseDialog();
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.SelectionMode == SelectionMode.Single)
+            {
+                if (e.AddedItems.Count > 0 &&
+                    e.AddedItems[0] is IStorageFile file)
+                {
+                    ViewModel.SelectedFiles.Clear();
+                    ViewModel.SelectedFiles.Add(file);
+                }
+            }
+            else
+            {
+                foreach (object item in e.AddedItems)
+                    if (item is IStorageFile file)
+                        ViewModel.SelectedFiles.Add(file);
+
+                foreach (object item in e.RemovedItems)
+                    if (item is IStorageFile file)
+                        ViewModel.SelectedFiles.Remove(file);
+            }
+
+            ViewModel.HasSelection = ViewModel.SelectedFiles.Count > 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
new file mode 100644
index 00000000..8dda9189
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileOpenPickerViewModel.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileOpenPickerViewModel : PickerViewModelBase<FilePickerOpenOptions>
+    {
+        [ObservableProperty] private bool _hasSelection;
+
+        [ObservableProperty] private ObservableCollection<IStorageFile> _selectedFiles = new();
+
+        [ObservableProperty] [NotifyPropertyChangedFor(nameof(CurrentFolderPath))]
+        private int _selectedFilterIndex;
+
+        [ObservableProperty] private SelectionMode _selectionMode;
+
+        public FileOpenPickerViewModel(FilePickerOpenOptions options)
+            : base(options)
+        {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
+            SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+        }
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            if (Options.FileTypeFilter == null || Options.FileTypeFilter.Count == 0)
+                return true;
+
+            if (item is IStorageFile file)
+            {
+                FilePickerFileType selectedFileType = Options.FileTypeFilter[SelectedFilterIndex]!;
+                if (selectedFileType.Patterns == null)
+                    return true;
+
+                foreach (string pattern in selectedFileType.Patterns)
+                    if (file.Path.LocalPath.EndsWith(pattern.TrimStart('*'), StringComparison.OrdinalIgnoreCase))
+                        return true;
+                return false;
+            }
+
+            // show folders
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml b/src/Consolonia.Core/Controls/FileSavePicker.axaml
new file mode 100644
index 00000000..81554d4f
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml
@@ -0,0 +1,64 @@
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FileSavePickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FileSavePicker"
+                       Icon="📰"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
+    <Grid RowDefinitions="Auto * Auto Auto">
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁 " />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
+        </Grid>
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectedItem="{Binding SelectedItem}"
+                 DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <Grid Grid.Row="2"
+              ColumnDefinitions="Auto *">
+            <TextBlock Text="File:"
+                       Margin="0 0 1 0" />
+            <TextBox Text="{Binding SavePath, Mode=TwoWay}"
+                     Grid.Column="1" />
+        </Grid>
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="SaveButton"
+                    Content="Save"
+                    Click="OnOK"
+                    IsEnabled="{Binding SavePath, Converter={x:Static ObjectConverters.IsNotNull}}" />
+            <Button x:Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
+        </StackPanel>
+    </Grid>
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
new file mode 100644
index 00000000..2d96f170
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileSavePicker : DialogWindow
+    {
+        public FileSavePicker()
+            : this(new FilePickerSaveOptions())
+        {
+        }
+
+        public FileSavePicker(FilePickerSaveOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            DataContext = new FileSavePickerViewModel(options);
+            InitializeComponent();
+            CancelButton.Focus();
+        }
+
+        /// <summary>
+        ///     Gets the file picker save options associated with this dialog.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
+        public FilePickerSaveOptions Options =>
+            (DataContext as FileSavePickerViewModel)?.Options
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+
+        /// <summary>
+        ///     Gets the view model associated with this dialog.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
+        private FileSavePickerViewModel ViewModel =>
+            DataContext as FileSavePickerViewModel
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is IStorageFolder folder)
+            {
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
+            }
+            else if (listbox.SelectedItem is IStorageFile file)
+            {
+                CloseDialog(file);
+            }
+        }
+
+        private async void OnOK(object sender, RoutedEventArgs e)
+        {
+            var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            ArgumentNullException.ThrowIfNull(lifetime);
+            ArgumentNullException.ThrowIfNull(lifetime.MainWindow);
+            ArgumentNullException.ThrowIfNull(lifetime.MainWindow.StorageProvider);
+
+            string savePath = ViewModel.SavePath;
+            if (!Path.IsPathFullyQualified(ViewModel.SavePath))
+                savePath = Path.GetFullPath(Path.Combine(ViewModel.CurrentFolder.Path.LocalPath, ViewModel.SavePath));
+
+            IStorageFile file =
+                await lifetime.MainWindow.StorageProvider.TryGetFileFromPathAsync(new Uri($"file://{savePath}"));
+            if (file == null)
+            {
+                IStorageFolder folder =
+                    await lifetime.MainWindow.StorageProvider.TryGetFolderFromPathAsync(
+                        new Uri($"file://{Path.GetDirectoryName(savePath)}"));
+                if (folder == null)
+                {
+                    CloseDialog();
+                    return;
+                }
+
+                file = await folder.CreateFileAsync(Path.GetFileName(savePath));
+            }
+
+            CloseDialog(file);
+        }
+
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            CloseDialog();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
new file mode 100644
index 00000000..2fb1f725
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FileSavePickerViewModel.cs
@@ -0,0 +1,34 @@
+using System;
+using System.ComponentModel;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FileSavePickerViewModel : PickerViewModelBase<FilePickerSaveOptions>
+    {
+        [ObservableProperty] private string _savePath = string.Empty;
+
+        [ObservableProperty] [NotifyPropertyChangedFor(nameof(SelectedFile))]
+        private IStorageItem _selectedItem;
+
+        public FileSavePickerViewModel(FilePickerSaveOptions options)
+            : base(options)
+        {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
+            PropertyChanged += FileSavePickerViewModel_PropertyChanged;
+        }
+
+        public IStorageFile SelectedFile => SelectedItem as IStorageFile;
+
+        private void FileSavePickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SelectedFile)) SavePath = SelectedFile?.Path.LocalPath ?? string.Empty;
+        }
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml b/src/Consolonia.Core/Controls/FolderPicker.axaml
new file mode 100644
index 00000000..4c4347c0
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml
@@ -0,0 +1,59 @@
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:storage="clr-namespace:Avalonia.Platform.Storage;assembly=Avalonia.Base"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:FolderPickerViewModel"
+                       x:Class="Consolonia.Core.Controls.FolderPicker"
+                       Icon="📁"
+                       CancelOnEscape="True"
+                       Title="{Binding Options.Title}">
+    <Grid RowDefinitions="Auto * Auto">
+        <Grid ColumnDefinitions="Auto *">
+            <TextBlock Text="📁"
+                       Margin="0 0 1 0" />
+            <TextBox Text="{Binding CurrentFolderPath, Mode=TwoWay}"
+                     Grid.Column="1" />
+        </Grid>
+        <ListBox x:Name="ItemsListBox"
+                 Grid.Row="1"
+                 ItemsSource="{Binding Items}"
+                 SelectionMode="{Binding SelectionMode}"
+                 SelectionChanged="ListBox_SelectionChanged"
+                 DoubleTapped="OnDoubleTapped">
+            <ListBox.DataTemplates>
+                <DataTemplate DataType="{x:Type storage:IStorageFolder}">
+                    <Grid ColumnDefinitions="Auto * "
+                          Background="Transparent">
+                        <TextBlock Text="📁"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+                <DataTemplate DataType="{x:Type storage:IStorageFile}">
+                    <Grid ColumnDefinitions="Auto *"
+                          Background="Transparent">
+                        <TextBlock Text="📰"
+                                   Margin="0 0 1 0" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Name}" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.DataTemplates>
+        </ListBox>
+        <StackPanel Grid.Row="2"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="1">
+            <Button x:Name="OkButton"
+                    Content="OK"
+                    Click="OnOK"
+                    IsEnabled="{Binding HasSelection}" />
+            <Button Name="CancelButton"
+                    Content="Cancel"
+                    Click="OnCancel" />
+        </StackPanel>
+    </Grid>
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPicker.axaml.cs b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
new file mode 100644
index 00000000..3999c12f
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderPicker.axaml.cs
@@ -0,0 +1,77 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FolderPicker : DialogWindow
+    {
+        public FolderPicker()
+            : this(new FolderPickerOpenOptions())
+        {
+        }
+
+        public FolderPicker(FolderPickerOpenOptions options)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            DataContext = new FolderPickerViewModel(options);
+            InitializeComponent();
+            CancelButton.Focus();
+        }
+
+        private FolderPickerViewModel ViewModel => (FolderPickerViewModel)DataContext;
+
+        public FolderPickerOpenOptions Options =>
+            ((FolderPickerViewModel)DataContext)?.Options ?? new FolderPickerOpenOptions();
+
+        private void OnDoubleTapped(object sender, TappedEventArgs e)
+        {
+            var listbox = (ListBox)sender;
+            if (listbox.SelectedItem is SystemStorageFolder folder)
+            {
+                ViewModel.CurrentFolder = folder;
+                ViewModel.CurrentFolderPath = folder.Path.LocalPath;
+                ViewModel.SelectedFolders.Clear();
+                ViewModel.HasSelection = false;
+            }
+        }
+
+        private void OnOK(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(ViewModel.SelectedFolders);
+        }
+
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            CloseDialog();
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.SelectionMode == SelectionMode.Single)
+            {
+                if (e.AddedItems.Count > 0 &&
+                    e.AddedItems[0] is IStorageFolder folder)
+                {
+                    ViewModel.SelectedFolders.Clear();
+                    ViewModel.SelectedFolders.Add(folder);
+                }
+            }
+            else
+            {
+                foreach (object item in e.AddedItems)
+                    if (item is IStorageFolder folder)
+                        ViewModel.SelectedFolders.Add(folder);
+
+                foreach (object item in e.RemovedItems)
+                    if (item is IStorageFolder folder)
+                        ViewModel.SelectedFolders.Remove(folder);
+            }
+
+            ViewModel.HasSelection = ViewModel.SelectedFolders.Count > 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/FolderPickerViewModel.cs b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
new file mode 100644
index 00000000..1b599554
--- /dev/null
+++ b/src/Consolonia.Core/Controls/FolderPickerViewModel.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class FolderPickerViewModel : PickerViewModelBase<FolderPickerOpenOptions>
+    {
+        [ObservableProperty] private bool _hasSelection;
+
+        [ObservableProperty] private ObservableCollection<IStorageFolder> _selectedFolders = new();
+
+        [ObservableProperty] private SelectionMode _selectionMode;
+
+        public FolderPickerViewModel(FolderPickerOpenOptions options)
+            : base(options)
+        {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
+            SelectionMode = options.AllowMultiple ? SelectionMode.Multiple : SelectionMode.Single;
+        }
+
+        protected override bool FilterItem(IStorageItem item)
+        {
+            return item is IStorageFolder;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml b/src/Consolonia.Core/Controls/MessageBox.axaml
new file mode 100644
index 00000000..b5f09228
--- /dev/null
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml
@@ -0,0 +1,37 @@
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
+                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                       xmlns:controls="clr-namespace:Consolonia.Core.Controls"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       x:DataType="controls:MessageBoxViewModel"
+                       x:Class="Consolonia.Core.Controls.MessageBox"
+                       CancelOnEscape="True"
+                       WindowStartupLocation="CenterOwner"
+                       Title="{Binding Title}">
+    <Grid RowDefinitions="Auto Auto">
+
+        <TextBlock Text="{Binding Text}"
+                   Margin="1" />
+
+        <StackPanel Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Grid.Row="1">
+            <Button x:Name="OkButton"
+                    Content="{Binding OkContent}"
+                    IsVisible="{Binding ShowOkButton}"
+                    Click="OnOk" />
+            <Button x:Name="YesButton"
+                    Content="{Binding YesContent}"
+                    IsVisible="{Binding ShowYesButton}"
+                    Click="OnYes" />
+            <Button x:Name="NoButton"
+                    Content="{Binding NoContent}"
+                    IsVisible="{Binding ShowNoButton}"
+                    Click="OnNo" />
+            <Button x:Name="CancelButton"
+                    Content="{Binding CancelContent}"
+                    IsVisible="{Binding ShowCancelButton}"
+                    Click="OnCancel" />
+        </StackPanel>
+    </Grid>
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/MessageBox.axaml.cs b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
new file mode 100644
index 00000000..63bd743a
--- /dev/null
+++ b/src/Consolonia.Core/Controls/MessageBox.axaml.cs
@@ -0,0 +1,209 @@
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Consolonia.Core.Controls
+{
+    public partial class MessageBox : DialogWindow
+    {
+        public static readonly DirectProperty<MessageBox, object> OkProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Ok), mb => mb.Ok, (mb, value) => mb.Ok = value);
+
+        public static readonly DirectProperty<MessageBox, object> CancelProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Cancel), mb => mb.Cancel,
+                (mb, value) => mb.Cancel = value);
+
+        public static readonly DirectProperty<MessageBox, object> YesProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(Yes), mb => mb.Yes,
+                (mb, value) => mb.Yes = value);
+
+        public static readonly DirectProperty<MessageBox, object> NoProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, object>(nameof(No), mb => mb.No, (mb, value) => mb.No = value);
+
+        public static readonly DirectProperty<MessageBox, Mode> ModeProperty =
+            AvaloniaProperty.RegisterDirect<MessageBox, Mode>(nameof(Mode), mb => mb.Mode,
+                (mb, value) => mb.Mode = value);
+
+        private object _cancel = "Cancel";
+
+        private Mode _mode = Mode.Ok;
+
+        private object _no = "No";
+
+
+        private object _ok = "OK";
+
+        private object _yes = "Yes";
+
+        public MessageBox()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            InitializeComponent();
+
+            AttachedToVisualTree += (_, _) =>
+            {
+                // we don't hook this up until the dialog is shown as the visible state is driven off of the DataContext
+                // which is set at ShowDialogAsync() time. 
+                if (OkButton.IsVisible)
+                    OkButton.AttachedToVisualTree += (_, _) => OkButton.Focus();
+                else if (YesButton.IsVisible)
+                    YesButton.AttachedToVisualTree += (_, _) => YesButton.Focus();
+                else if (CancelButton.IsVisible)
+                    CancelButton.AttachedToVisualTree += (_, _) => CancelButton.Focus();
+                else if (NoButton.IsVisible)
+                    NoButton.AttachedToVisualTree += (_, _) => NoButton.Focus();
+            };
+        }
+
+        public Mode Mode
+        {
+            get => _mode;
+            set => SetAndRaise(ModeProperty, ref _mode, value);
+        }
+
+        public object Ok
+        {
+            get => _ok;
+            set => SetAndRaise(OkProperty, ref _ok, value);
+        }
+
+        public object Cancel
+        {
+            get => _cancel;
+            set => SetAndRaise(CancelProperty, ref _cancel, value);
+        }
+
+        public object Yes
+        {
+            get => _yes;
+            set => SetAndRaise(YesProperty, ref _yes, value);
+        }
+
+        public object No
+        {
+            get => _no;
+            set => SetAndRaise(NoProperty, ref _no, value);
+        }
+
+        public async Task<MessageBoxResult> ShowDialogAsync(Control parent, string text, string title = null)
+        {
+            DataContext = new MessageBoxViewModel(Mode, Ok, Cancel, Yes, No, text, title ?? Title);
+#nullable enable
+            var result = await ShowDialogAsync<MessageBoxResult?>(parent);
+            if (result.HasValue) return result.Value;
+            return MessageBoxResult.Cancel;
+#nullable disable
+        }
+
+        private void OnOk(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(MessageBoxResult.Ok);
+        }
+
+        private void OnCancel(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(MessageBoxResult.Cancel);
+        }
+
+        private void OnYes(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(MessageBoxResult.Yes);
+        }
+
+        private void OnNo(object sender, RoutedEventArgs e)
+        {
+            CloseDialog(MessageBoxResult.No);
+        }
+    }
+
+    public enum Mode
+    {
+        /// <summary>
+        ///     Specifies that the message box contains an OK button.
+        /// </summary>
+        Ok,
+
+        /// <summary>
+        ///     Specifies that the message box contains OK and Cancel buttons.
+        /// </summary>
+        OkCancel,
+
+        /// <summary>
+        ///     Specifies that the message box contains Yes and No buttons.
+        /// </summary>
+        YesNo,
+
+        /// <summary>
+        ///     Specifies that the message box contains Yes, No, and Cancel buttons.
+        /// </summary>
+        YesNoCancel
+    }
+
+    public enum MessageBoxResult
+    {
+        Ok,
+        Cancel,
+        Yes,
+        No
+    }
+
+    internal partial class MessageBoxViewModel : ObservableObject
+    {
+        [ObservableProperty] private object _cancelContent;
+
+        [ObservableProperty] private Mode _mode;
+
+        [ObservableProperty] private object _noContent;
+
+        [ObservableProperty] private object _okContent;
+
+        [ObservableProperty] private bool _showCancelButton;
+
+        [ObservableProperty] private bool _showNoButton;
+
+        [ObservableProperty] private bool _showOkButton;
+
+        [ObservableProperty] private bool _showYesButton;
+
+        [ObservableProperty] private string _text;
+
+        [ObservableProperty] private string _title;
+
+        [ObservableProperty] private object _yesContent;
+
+        internal MessageBoxViewModel(Mode mode, object okContent, object cancelContent, object yesContent,
+            object noContent, string text, string title)
+        {
+            _mode = mode;
+            switch (mode)
+            {
+                case Mode.Ok:
+                    ShowOkButton = true;
+                    break;
+                case Mode.OkCancel:
+                    ShowOkButton = true;
+                    ShowCancelButton = true;
+                    break;
+                case Mode.YesNo:
+                    ShowYesButton = true;
+                    ShowNoButton = true;
+                    break;
+                case Mode.YesNoCancel:
+                    ShowYesButton = true;
+                    ShowNoButton = true;
+                    ShowCancelButton = true;
+                    break;
+            }
+
+            _okContent = okContent;
+            _cancelContent = cancelContent;
+            _yesContent = yesContent;
+            _noContent = noContent;
+            _text = text;
+            _title = title;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Controls/PickerViewModelBase.cs b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
new file mode 100644
index 00000000..65266f55
--- /dev/null
+++ b/src/Consolonia.Core/Controls/PickerViewModelBase.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Core.Controls
+{
+    public abstract partial class PickerViewModelBase<TPickerOptions> : ObservableObject
+        where TPickerOptions : PickerOptions
+    {
+        [ObservableProperty] private IStorageFolder _currentFolder;
+
+        [ObservableProperty] private string _currentFolderPath;
+
+        [ObservableProperty] private ObservableCollection<IStorageItem> _items = new();
+
+
+        [ObservableProperty] private TPickerOptions _options;
+
+        protected PickerViewModelBase(TPickerOptions options)
+        {
+            ArgumentNullException.ThrowIfNull(options, nameof(options));
+            Options = options;
+            CurrentFolderPath = options.SuggestedStartLocation?.Path.LocalPath ?? Environment.CurrentDirectory;
+            CurrentFolder = options.SuggestedStartLocation ?? new SystemStorageFolder(Environment.CurrentDirectory);
+            _ = LoadCurrentFolder();
+            PropertyChanged += PickerViewModel_PropertyChanged;
+        }
+
+
+        private async void PickerViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(CurrentFolderPath):
+                    try
+                    {
+                        CurrentFolder = new SystemStorageFolder(new DirectoryInfo(CurrentFolderPath));
+                    }
+                    catch (DirectoryNotFoundException)
+                    {
+                        // ignore
+                    }
+
+                    break;
+
+                case nameof(CurrentFolder):
+                    await LoadCurrentFolder();
+                    break;
+            }
+        }
+
+        private async Task LoadCurrentFolder()
+        {
+            Items.Clear();
+
+            Items.Add(
+                new SystemStorageFolder(new DirectoryInfo(Path.Combine(CurrentFolder.Path.LocalPath, "..")), true));
+
+            await foreach (IStorageItem item in CurrentFolder.GetItemsAsync())
+                if (FilterItem(item))
+                    Items.Add(item);
+        }
+
+        protected abstract bool FilterItem(IStorageItem item);
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
index 542a7628..e8729947 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
@@ -10,6 +10,7 @@
 using Avalonia.Input.Raw;
 using Avalonia.Input.TextInput;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
@@ -251,6 +252,8 @@ public object TryGetFeature(Type featureType)
             if (featureType == typeof(ISystemNavigationManagerImpl))
                 return null;
             if (featureType == typeof(ITextInputMethodImpl)) return null;
+            if (featureType == typeof(IStorageProvider))
+                return AvaloniaLocator.Current.GetService<IStorageProvider>();
             throw new NotImplementedException("Consider this");
         }
 
@@ -314,7 +317,7 @@ private void OnConsoleOnResized()
                 try
                 {
                     // Wait for the delay period, this task will be canceled if another refresh comes in.
-                    await Task.Delay(_resizeDelay, _resizeCancellationTokenSource.Token).ConfigureAwait(false);
+                    await Task.Delay(_resizeDelay, _resizeCancellationTokenSource.Token);
 
                     // dispatch to the UI thread 
                     Dispatcher.UIThread.Post(() =>
@@ -359,7 +362,7 @@ await Dispatcher.UIThread.InvokeAsync(() =>
 #pragma warning restore CS0618 // Type or member is obsolete
                     Input!(rawInputEventArgs);
                     handled = rawInputEventArgs.Handled;
-                }, DispatcherPriority.Input).GetTask().ConfigureAwait(true);
+                }, DispatcherPriority.Input);
 
                 if (!handled && !char.IsControl(keyChar))
                     Dispatcher.UIThread.Post(() =>
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
index f65c7f2c..898361b3 100644
--- a/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs
@@ -6,6 +6,7 @@
 using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
 using Avalonia.Threading;
 using Consolonia.Core.Dummy;
@@ -51,6 +52,7 @@ public void Initialize()
                 .Bind<ICursorFactory>().ToConstant(new DummyCursorFactory())
                 .Bind<IPlatformIconLoader>().ToConstant(new DummyIconLoader())
                 .Bind<IPlatformSettings>().ToSingleton<ConsoloniaPlatformSettings>()
+                .Bind<IStorageProvider>().ToSingleton<ConsoloniaStorageProvider>()
                 /*.Bind<IKeyboardNavigationHandler>().ToTransient<ArrowsAndKeyboardNavigationHandler>() todo: implement this navigation*/
                 //.Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 //.Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
new file mode 100644
index 00000000..49d54b71
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Controls;
+
+namespace Consolonia.Core.Infrastructure
+{
+    public class ConsoloniaStorageProvider : IStorageProvider
+    {
+        public bool CanOpen => true;
+
+        public bool CanSave => true;
+
+        public bool CanPickFolder => true;
+
+
+        public Task<IStorageBookmarkFile> OpenFileBookmarkAsync(string bookmark)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
+        {
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
+
+            var picker = new FileOpenPicker(options);
+            var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFile>>(mainWindow);
+            return results;
+        }
+
+        public Task<IStorageBookmarkFolder> OpenFolderBookmarkAsync(string bookmark)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
+        {
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
+
+            var picker = new FolderPicker(options);
+            var results = await picker.ShowDialogAsync<IReadOnlyList<IStorageFolder>>(mainWindow);
+            return results;
+        }
+
+        public async Task<IStorageFile> SaveFilePickerAsync(FilePickerSaveOptions options)
+        {
+            Window mainWindow = ((IClassicDesktopStyleApplicationLifetime)Application.Current?.ApplicationLifetime)
+                ?.MainWindow;
+            ArgumentNullException.ThrowIfNull(mainWindow);
+
+            var picker = new FileSavePicker(options);
+            var results = await picker.ShowDialogAsync<IStorageFile>(mainWindow);
+            return results;
+        }
+
+        public Task<IStorageFile> TryGetFileFromPathAsync(Uri filePath)
+        {
+            if (File.Exists(filePath.LocalPath))
+                return Task.FromResult<IStorageFile>(new SystemStorageFile(filePath));
+            return Task.FromResult<IStorageFile>(null);
+        }
+
+        public Task<IStorageFolder> TryGetFolderFromPathAsync(Uri folderPath)
+        {
+            if (Directory.Exists(folderPath.LocalPath))
+                return Task.FromResult<IStorageFolder>(new SystemStorageFolder(folderPath));
+            return Task.FromResult<IStorageFolder>(null);
+        }
+
+        public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnownFolder)
+        {
+            string dir = wellKnownFolder switch
+            {
+                WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+                WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                WellKnownFolder.Downloads => Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                WellKnownFolder.Pictures => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures),
+                WellKnownFolder.Music => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic),
+                WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),
+                _ => null
+            };
+            if (string.IsNullOrEmpty(dir))
+                return Task.FromResult<IStorageFolder>(null);
+            return Task.FromResult<IStorageFolder>(new SystemStorageFolder(dir));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs b/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
index d23a5d3d..96260749 100644
--- a/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
+++ b/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
@@ -203,10 +203,10 @@ protected void StartSizeCheckTimerAsync(uint slowInterval = 1500)
                 {
                     Task pauseTask = PauseTask;
                     if (pauseTask != null)
-                        await pauseTask.ConfigureAwait(false);
+                        await pauseTask;
 
                     int timeout = (int)(CheckActualizeTheSize() ? 1 : slowInterval);
-                    await Task.Delay(timeout).ConfigureAwait(false);
+                    await Task.Delay(timeout);
                 }
             });
         }
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
new file mode 100644
index 00000000..2c8247d0
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFile.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Infrastructure
+{
+    [DebuggerDisplay("File: {Name}")]
+    public sealed class SystemStorageFile : IStorageFile
+    {
+        private readonly FileInfo _fileInfo;
+
+
+        public SystemStorageFile(string file)
+        {
+            _fileInfo = new FileInfo(file);
+        }
+
+        public SystemStorageFile(Uri uri)
+        {
+            _fileInfo = new FileInfo(uri.LocalPath);
+        }
+
+        public SystemStorageFile(FileInfo fileInfo)
+        {
+            _fileInfo = fileInfo;
+        }
+
+        public string Name => _fileInfo.Name;
+
+        public Uri Path => new($"file://{_fileInfo.FullName}");
+
+        public bool CanBookmark => false;
+
+        public Task DeleteAsync()
+        {
+            _fileInfo.Delete();
+            return Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public Task<StorageItemProperties> GetBasicPropertiesAsync()
+        {
+            var result = new StorageItemProperties((ulong)_fileInfo.Length, _fileInfo.CreationTime,
+                _fileInfo.LastWriteTime);
+            return Task.FromResult(result);
+        }
+
+        public Task<IStorageFolder> GetParentAsync()
+        {
+            IStorageFolder result = new SystemStorageFolder(_fileInfo.Directory!);
+            return Task.FromResult(result);
+        }
+
+        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
+        {
+            string path = destination.Path.LocalPath;
+            string targetPath = System.IO.Path.Combine(path, _fileInfo.Name);
+            _fileInfo.MoveTo(targetPath);
+            return Task.FromResult((IStorageItem)new SystemStorageFile(targetPath));
+        }
+
+        public async Task<Stream> OpenReadAsync()
+        {
+            await Task.CompletedTask;
+            return _fileInfo.OpenRead();
+        }
+
+        public async Task<Stream> OpenWriteAsync()
+        {
+            await Task.CompletedTask;
+            return _fileInfo.OpenWrite();
+        }
+
+        public Task<string> SaveBookmarkAsync()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
new file mode 100644
index 00000000..2eba8955
--- /dev/null
+++ b/src/Consolonia.Core/Infrastructure/SystemStorageFolder.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+
+namespace Consolonia.Core.Infrastructure
+{
+    [DebuggerDisplay("Folder: {Name}")]
+    public sealed class SystemStorageFolder : IStorageFolder
+    {
+        private readonly DirectoryInfo _directoryInfo;
+        private readonly bool _isParent;
+
+        public SystemStorageFolder(string path)
+        {
+            _directoryInfo = new DirectoryInfo(path);
+        }
+
+        public SystemStorageFolder(Uri uri)
+        {
+            _directoryInfo = new DirectoryInfo(uri.LocalPath);
+        }
+
+        public SystemStorageFolder(DirectoryInfo directoryInfo, bool isParent = false)
+        {
+            _isParent = isParent;
+            _directoryInfo = directoryInfo;
+        }
+
+        public string Name => _isParent ? ".." : _directoryInfo.Name;
+
+        public Uri Path => new($"file://{_directoryInfo.FullName}");
+
+        public bool CanBookmark => false;
+
+        public async Task<IStorageFile> CreateFileAsync(string name)
+        {
+            await Task.CompletedTask;
+
+            string path = System.IO.Path.Combine(_directoryInfo.FullName, name);
+            using (FileStream stream = File.Create(path))
+            {
+                await stream.WriteAsync(Array.Empty<byte>().AsMemory(0, 0));
+            }
+
+            return new SystemStorageFile(path);
+        }
+
+        public Task<IStorageFolder> CreateFolderAsync(string name)
+        {
+            DirectoryInfo dirInfo = Directory.CreateDirectory(System.IO.Path.Combine(_directoryInfo.FullName, name));
+            return Task.FromResult((IStorageFolder)new SystemStorageFolder(dirInfo));
+        }
+
+        public Task DeleteAsync()
+        {
+            return Task.Run(() => _directoryInfo.Delete());
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public Task<StorageItemProperties> GetBasicPropertiesAsync()
+        {
+            var properties = new StorageItemProperties(dateCreated: _directoryInfo.CreationTime,
+                dateModified: _directoryInfo.LastAccessTime);
+            return Task.FromResult(properties);
+        }
+
+        public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
+        {
+            await Task.CompletedTask;
+
+            if (_directoryInfo.Exists)
+            {
+                foreach (DirectoryInfo folder in _directoryInfo.GetDirectories())
+                    yield return new SystemStorageFolder(folder);
+
+                foreach (FileInfo file in _directoryInfo.GetFiles()) yield return new SystemStorageFile(file);
+            }
+        }
+
+        public Task<IStorageFolder> GetParentAsync()
+        {
+            if (_directoryInfo.Parent == null)
+                return Task.FromResult((IStorageFolder)null);
+
+            return Task.FromResult((IStorageFolder)new SystemStorageFolder(_directoryInfo.Parent));
+        }
+
+        public Task<IStorageItem> MoveAsync(IStorageFolder destination)
+        {
+            string targetPath = System.IO.Path.Combine(destination.Path.LocalPath, _directoryInfo.Name);
+            _directoryInfo.MoveTo(targetPath);
+            return Task.FromResult((IStorageItem)new SystemStorageFolder(targetPath));
+        }
+
+        public Task<string> SaveBookmarkAsync()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/App.cs b/src/Consolonia.Gallery/App.cs
index 51beb67f..eaae92d2 100644
--- a/src/Consolonia.Gallery/App.cs
+++ b/src/Consolonia.Gallery/App.cs
@@ -21,6 +21,11 @@ public App()
             Styles.Add(new TurboVisionTheme(new Uri("avares://Consolonia.Gallery")));
         }
 
+        public override void RegisterServices()
+        {
+            base.RegisterServices();
+        }
+
         public override void OnFrameworkInitializationCompleted()
         {
             ((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime)!.MainWindow = new ControlsListView();
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
index 507833ea..24cde639 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryAnimatedLines.axaml.cs
@@ -3,7 +3,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using Consolonia.Core.Infrastructure;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
@@ -16,11 +15,6 @@ public GalleryAnimatedLines()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void PauseButton_OnClick(object _, RoutedEventArgs _2)
             // ReSharper restore UnusedParameter.Local
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
index dfe84a0d..15ab6006 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryButton.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryButton()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
index b4e2ca33..3de08651 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendar.axaml.cs
@@ -1,6 +1,5 @@
-using System;
+using System;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -20,9 +19,5 @@ public GalleryCalendar()
             cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
index 112474c1..b1b2e693 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCalendarPicker.axaml.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.CompilerServices;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -27,10 +26,6 @@ public GalleryCalendarPicker()
             dp4.TemplateApplied += (_, _) => { dp4.BlackoutDates?.AddDatesInPast(); };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public sealed class GalleryCalendarPickerDataContext : INotifyPropertyChanged
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
index 1b39035e..806e1d36 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCanvas.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryCanvas()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
index 425d38b2..ce9652f2 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryCheckBox.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryCheckBox()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
index 48dfb914..53cdb5b5 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryColors.axaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Consolonia.Core.Drawing;
 
@@ -17,11 +16,6 @@ public GalleryColors()
             this.DataContext = new RGBModel() { Color = Color.FromRgb((byte)rnd.Next(255), (byte)rnd.Next(255), (byte)rnd.Next(255)) };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void Random_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             Random rnd = new Random();
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
index cb07a61c..2deff62f 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryComboBox.axaml.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Linq;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,19 +11,13 @@ public partial class GalleryComboBox : UserControl
         public GalleryComboBox()
         {
             InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
 
-            var fontComboBox = this.Find<ComboBox>("VarsComboBox");
-
-            fontComboBox.ItemsSource = Environment.GetEnvironmentVariables()
+            VarsComboBox.ItemsSource = Environment.GetEnvironmentVariables()
                 .Cast<DictionaryEntry>()
                 .Select(environmentVariable => environmentVariable.Key + "=" + environmentVariable.Value).ToList();
 
-            fontComboBox.SelectedIndex = 0;
+            VarsComboBox.SelectedIndex = 0;
         }
+
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
index ee219e32..8b5bfea7 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDataGrid.axaml.cs
@@ -8,7 +8,6 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Consolonia.Core.Drawing;
 
@@ -30,10 +29,9 @@ public GalleryDataGrid()
                 ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
             collectionView1.SortDescriptions.Add(dataGridSortDescription);
-            var dg1 = this.FindControl<DataGrid>("DataGrid1");
-            dg1.IsReadOnly = true;
-            dg1.LoadingRow += Dg1_LoadingRow;
-            dg1.Sorting += (_, a) =>
+            DataGrid1.IsReadOnly = true;
+            DataGrid1.LoadingRow += DataGrid1_LoadingRow;
+            DataGrid1.Sorting += (_, a) =>
             {
                 var binding = (a.Column as DataGridBoundColumn)?.Binding as Binding;
 
@@ -42,18 +40,16 @@ public GalleryDataGrid()
                     && !collectionView1.SortDescriptions.Contains(dataGridSortDescription))
                     collectionView1.SortDescriptions.Add(dataGridSortDescription);
             };
-            dg1.ItemsSource = collectionView1;
+            DataGrid1.ItemsSource = collectionView1;
 
-            var dg2 = this.FindControl<DataGrid>("DataGridGrouping");
-            dg2.IsReadOnly = true;
+            DataGridGrouping.IsReadOnly = true;
 
             var collectionView2 = new DataGridCollectionView(Countries.All);
             collectionView2.GroupDescriptions.Add(new DataGridPathGroupDescription("Region"));
 
-            dg2.ItemsSource = collectionView2;
+            DataGridGrouping.ItemsSource = collectionView2;
 
-            var dg3 = this.FindControl<DataGrid>("DataGridEdit");
-            dg3.IsReadOnly = false;
+            DataGridEdit.IsReadOnly = false;
 
             var items = new List<Person>
             {
@@ -63,23 +59,17 @@ public GalleryDataGrid()
             };
             var collectionView3 = new DataGridCollectionView(items);
 
-            dg3.ItemsSource = collectionView3;
+            DataGridEdit.ItemsSource = collectionView3;
 
-            var addButton = this.FindControl<Button>("BtnAdd");
-            addButton.Click += (_, _) => collectionView3.AddNew();
+            BtnAdd.Click += (_, _) => collectionView3.AddNew();
         }
 
         // ReSharper disable once MemberCanBeMadeStatic.Local
-        private void Dg1_LoadingRow(object sender, DataGridRowEventArgs e)
+        private void DataGrid1_LoadingRow(object sender, DataGridRowEventArgs e)
         {
             e.Row.Header = e.Row.GetIndex() + 1;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private class ReversedStringComparer : IComparer<object>, IComparer
         {
             public int Compare(object x, object y)
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
index 3d67ca9d..94e54faa 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryDialog.axaml.cs
@@ -1,6 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,16 +12,12 @@ public GalleryDialog()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void Button_OnClick(object _, RoutedEventArgs e)
-            // ReSharper restore UnusedParameter.Local
+        // ReSharper restore UnusedParameter.Local
         {
-            await new SomeDialogWindow(50, 15).ShowDialogAsync(this);
+            var lifetime = (IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime;
+            await new SomeDialogWindow(50, 15).ShowDialogAsync(lifetime.MainWindow);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
index 7a078ad4..90b41f5c 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryFlyout.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryFlyout()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
index d2f59d7b..ed372284 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryGradientBrush.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
@@ -12,14 +11,9 @@ public GalleryGradientBrush()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         private void Linear_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.FindControl<Grid>("MyGrid").Background = new LinearGradientBrush
+            this.MyGrid.Background = new LinearGradientBrush
             {
                 StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
                 EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
@@ -33,7 +27,7 @@ private void Linear_Click(object sender, Avalonia.Interactivity.RoutedEventArgs
 
         private void Radial_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            this.FindControl<Grid>("MyGrid").Background = new RadialGradientBrush
+            this.MyGrid.Background = new RadialGradientBrush
             {
                 Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
                 GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
@@ -48,7 +42,7 @@ private void Radial_Click(object sender, Avalonia.Interactivity.RoutedEventArgs
         private void Conic_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
 
-            this.FindControl<Grid>("MyGrid").Background = new ConicGradientBrush
+            this.MyGrid.Background = new ConicGradientBrush
             {
                 Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
                 Angle = 0,
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
index f70812d4..267c9688 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryImage.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,10 +9,5 @@ public GalleryImage()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
index 0a847ece..d46892f7 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryListBox.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,9 +11,5 @@ public GalleryListBox()
             DataContext = new ListBoxPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
index bdf04dea..899b5ec2 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMenu.axaml.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -14,11 +13,6 @@ public GalleryMenu()
             DataContext = new MenuPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (_model != null)
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
new file mode 100644
index 00000000..feea6111
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
@@ -0,0 +1,20 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:gallery="clr-namespace:Consolonia.Gallery.Gallery.GalleryViews"
+             mc:Ignorable="d"
+             x:DataType="gallery:GalleryMessageBoxViewModel"
+             x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryMessageBox">
+
+    <StackPanel Orientation="Vertical">
+        <WrapPanel Orientation="Vertical" HorizontalAlignment="Left">
+            <Button Click="OnOk" >Show Ok</Button>
+            <Button Click="OnOkCancel" >Show Ok/Cancel</Button>
+            <Button Click="OnYesNo" >Show Yes/No</Button>
+            <Button Click="OnYesNoCancel" >Show Yes/No/Cancel</Button>
+            <Button Click="OnCustom" >Show Custom</Button>
+        </WrapPanel>
+        <TextBlock Text="{Binding Result}"/>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
new file mode 100644
index 00000000..71ee6161
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
@@ -0,0 +1,92 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Controls;
+
+namespace Consolonia.Gallery.Gallery.GalleryViews
+{
+    public partial class GalleryMessageBoxViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private string _result;
+    }
+
+    public partial class GalleryMessageBox : UserControl
+    {
+        public GalleryMessageBox()
+        {
+            InitializeComponent();
+            this.DataContext = new GalleryMessageBoxViewModel();
+        }
+
+        private GalleryMessageBoxViewModel ViewModel => (GalleryMessageBoxViewModel)DataContext;
+
+        private async void OnOk(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.Ok,
+                Title = "OK Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "This is a message");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnOkCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.OkCancel,
+                Title = "Ok/Cancel Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to OK or cancel?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnYesNo(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNo,
+                Title = "Yes/No Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnYesNoCancel(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNoCancel,
+                Title = "Yes/No/Cancel Message box",
+            };
+            var result = await mb.ShowDialogAsync(this, "Do you want to, or cancel?");
+            ViewModel.Result = result.ToString();
+        }
+
+        private async void OnCustom(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+
+            var mb = new MessageBox()
+            {
+                Mode = Mode.YesNoCancel,
+                Title = "Custom OK content Message box",
+                Yes= new TextBlock()
+                {
+                    Text = "😁 Yes",
+                    Foreground = Brushes.Lime
+                },
+                No = new TextBlock()
+                {
+                    Text = "😒 No",
+                    Foreground = Brushes.Red
+                }
+            };
+            var result = await mb.ShowDialogAsync(this, "Custom OK button");
+            ViewModel.Result = result.ToString();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
index aebc076a..c1435192 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryProgressBar.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryProgressBar()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
index 5f3c5de1..dfa597de 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryRadioButton.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -10,9 +9,5 @@ public GalleryRadioButton()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
index 4dc2d3fd..0a100f5c 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryScrollViewer.axaml.cs
@@ -1,13 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 // ReSharper disable UnusedMember.Global
 
@@ -25,10 +20,6 @@ public GalleryScrollViewer()
             DataContext = new ScrollViewerPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public class ScrollViewerPageViewModel : ViewModelBase
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
new file mode 100644
index 00000000..c84c0750
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml
@@ -0,0 +1,54 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:gallery="clr-namespace:Consolonia.Gallery.Gallery.GalleryViews"
+             mc:Ignorable="d"
+             x:DataType="gallery:GalleryStorageViewModel"
+             x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryStorage">
+
+    <StackPanel Orientation="Vertical">
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnOpenFile" >Open File Dialog</Button>
+            <Button Click="OnOpenMultipleFiles" >Open Multiple File Dialog</Button>
+        </WrapPanel>
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnSaveFile" >Save File Dialog</Button>
+        </WrapPanel>
+        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Button Click="OnOpenFolder" >Select Folder Dialog</Button>
+            <Button Click="OnOpenMultipleFolders" >Select Multiple Folder Dialog</Button>
+        </WrapPanel>
+        <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderBrush}" >
+            <StackPanel Orientation="Vertical" >
+                <TextBlock TextDecorations="Underline" Margin="0 -1 0 0">Files</TextBlock>
+                <ItemsControl ItemsSource="{Binding Files}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="📰 "/>
+                                <TextBlock Text="{Binding Name}"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderBrush}" >
+
+            <StackPanel Orientation="Vertical" >
+                <TextBlock TextDecorations="Underline" Margin="0 -1 0 0">Folders</TextBlock>
+                <ItemsControl ItemsSource="{Binding Folders}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="📁 "/>
+                                <TextBlock Text="{Binding Name}"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
new file mode 100644
index 00000000..4d7a7206
--- /dev/null
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryStorage.axaml.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Consolonia.Core.Infrastructure;
+
+namespace Consolonia.Gallery.Gallery.GalleryViews
+{
+    public partial class GalleryStorageViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private IReadOnlyList<IStorageFile> _files;
+
+        [ObservableProperty]
+        private IReadOnlyList<IStorageFolder> _folders;
+    }
+
+    public partial class GalleryStorage : UserControl
+    {
+        public GalleryStorage()
+        {
+            InitializeComponent();
+            this.DataContext = new GalleryStorageViewModel();
+        }
+
+        private GalleryStorageViewModel ViewModel => (GalleryStorageViewModel)DataContext;
+
+        private async void OnOpenFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFiles("Open file", allowMultiple: false);
+        }
+        private async void OnOpenMultipleFiles(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFiles("Open files", allowMultiple: true);
+        }
+
+        private async Task OpenFiles(string title, bool allowMultiple)
+        {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanOpen)
+                {
+                    var files = await storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions()
+                    {
+                        Title = title,
+                        AllowMultiple = allowMultiple,
+                        SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
+                        FileTypeFilter = new List<FilePickerFileType>()
+                        {
+                             new FilePickerFileType("All files") { Patterns = new[] { "*" } },
+                             new FilePickerFileType("Text") { Patterns = new[] { "*.txt" } },
+                             new FilePickerFileType("Comma Delimited Files") { Patterns = new[] { "*.csv" } },
+                             new FilePickerFileType("PDF") { Patterns = new[] { "*.pdf" } }
+                        },
+                    });
+
+                    ViewModel.Files = files;
+                }
+            }
+        }
+
+        private async void OnOpenFolder(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFolders(title: "Select a folder", allowMultiple: false);
+        }
+
+        private async void OnOpenMultipleFolders(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            await OpenFolders(title: "Select folder(s)", allowMultiple: true);
+        }
+
+        private async Task OpenFolders(string title, bool allowMultiple)
+        {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanOpen)
+                {
+                    var folders = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
+                    {
+                        Title = title,
+                        SuggestedStartLocation = new SystemStorageFolder(new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))),
+                        AllowMultiple = allowMultiple
+                    });
+                    ViewModel.Folders = folders;
+                }
+            }
+        }
+
+        private async void OnSaveFile(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            IClassicDesktopStyleApplicationLifetime lifetime = App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+            if (lifetime != null)
+            {
+                var storageProvider = lifetime.MainWindow.StorageProvider;
+                if (storageProvider.CanSave)
+                {
+                    var file = await storageProvider.SaveFilePickerAsync(new FilePickerSaveOptions()
+                    {
+                        Title = "Save File",
+                        SuggestedStartLocation = new SystemStorageFolder(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)),
+                        DefaultExtension = "txt",
+                        SuggestedFileName = "NewFile.txt",
+                        FileTypeChoices = new List<FilePickerFileType>()
+                        {
+                             new FilePickerFileType("Text") { Patterns = new[] { "*.txt" } },
+                             new FilePickerFileType("Comma Delimited Files") { Patterns = new[] { "*.csv" } },
+                             new FilePickerFileType("PDF") { Patterns = new[] { "*.pdf" } }
+                        },
+                    });
+
+                    ViewModel.Files = new List<IStorageFile>() { file };
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
index 2ff611b3..1c3023bb 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTabControl.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
@@ -36,10 +35,6 @@ public GalleryTabControl()
             };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 
     public class PageViewModel : ViewModelBase
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
index df05e8d8..16bd25fd 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBlock.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryTextBlock()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
index ed51c988..29f5a56f 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input.TextInput;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -12,13 +10,5 @@ public GalleryTextBox()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-            /*var textBox = this.Find<TextBox>("NumericWatermark");
-            if (textBox != null)
-                textBox
-                    .TextInputOptionsQuery += (_, a) => { a.ContentType = TextInputContentType.Number; };todo: migrade this*/
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
index 865a135c..a3c8b9dd 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryWelcome.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -11,9 +10,5 @@ public GalleryWelcome()
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
index 06c80b17..1ecf4994 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml
@@ -1,7 +1,7 @@
-<dialog:DialogWindow xmlns="https://github.com/avaloniaui"
+<controls:DialogWindow xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
-                     xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog;assembly=Consolonia.Themes.TurboVision"
+                     xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
                      HorizontalAlignment="Center"
                      VerticalAlignment="Center"
                      Title="Dialog"
@@ -31,4 +31,4 @@ Bill Ames
                 VerticalAlignment="Bottom"
                 Click="OneMore_Clicked" />
     </Panel>
-</dialog:DialogWindow>
\ No newline at end of file
+</controls:DialogWindow>
\ No newline at end of file
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
index 38ef926f..7fa50484 100644
--- a/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
+++ b/src/Consolonia.Gallery/Gallery/GalleryViews/SomeDialogWindow.axaml.cs
@@ -1,8 +1,6 @@
 using System;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Consolonia.Themes.TurboVision.Templates.Controls.Dialog;
+using Consolonia.Core.Controls;
 
 namespace Consolonia.Gallery.Gallery.GalleryViews
 {
@@ -15,10 +13,7 @@ public SomeDialogWindow(double width, double height)
             InitializeComponent();
             Width = width;
             Height = height;
-            Loaded += (_, _) =>
-            {
-                this.FindControl<Button>("Button")!.Focus();
-            };
+            this.Button.Focus();
         }
 
         // ReSharper disable once MemberCanBePrivate.Global Can be used by constructor
@@ -26,14 +21,9 @@ public SomeDialogWindow() : this(10 + Random.Next(20), 10 + Random.Next(10))
         {
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         // ReSharper disable UnusedParameter.Local
         private async void OneMore_Clicked(object sender, RoutedEventArgs e)
-            // ReSharper restore UnusedParameter.Local
+        // ReSharper restore UnusedParameter.Local
         {
             await new SomeDialogWindow().ShowDialogAsync(this);
         }
diff --git a/src/Consolonia.Gallery/View/ControlsListView.axaml.cs b/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
index a9a8d3e5..f602520b 100644
--- a/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
+++ b/src/Consolonia.Gallery/View/ControlsListView.axaml.cs
@@ -4,14 +4,12 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using Consolonia.Gallery.Gallery;
 
 namespace Consolonia.Gallery.View
 {
     public partial class ControlsListView : Window
     {
-        private readonly DataGrid _grid;
         private string[] _commandLineArgs;
         private readonly IEnumerable<GalleryItem> _items;
 
@@ -21,9 +19,7 @@ public ControlsListView()
 #if DEBUG
             this.AttachDevTools();
 #endif
-            _grid = this.FindControl<DataGrid>("Grid");
-            
-            _grid.ItemsSource = _items = GalleryItem.Enumerated.ToArray();
+            this.Grid.ItemsSource = _items = GalleryItem.Enumerated.ToArray();
 
             _commandLineArgs = ((ClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime)!.Args!;
             TrySetupSelected();
@@ -33,7 +29,7 @@ private void TrySetupSelected()
         {
             if (_commandLineArgs.Length is not 1 and not 2)
             {
-                _grid.SelectedIndex = 0;
+                this.Grid.SelectedIndex = 0;
                 return;
             }
 
@@ -53,16 +49,11 @@ private void TrySetupSelected()
                     $"Several gallery items found with provided name {itemToSelectName}");
             }
 
-            _grid.SelectedItem = itemToSelect;
-            _grid.Focus();
+            this.Grid.SelectedItem = itemToSelect;
+            this.Grid.Focus();
         }
 
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public void ChangeTo(string[] args)
         {
             _commandLineArgs = args;
diff --git a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
index aa57f415..63547ffb 100644
--- a/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
+++ b/src/Consolonia.GuiCS/Consolonia.GuiCS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>        
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-    </PropertyGroup>
+  <PropertyGroup>
+    <WarningsAsErrors>false</WarningsAsErrors>
+    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
 </Project>
diff --git a/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs b/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
index 9bb49037..2cc76d4b 100644
--- a/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
+++ b/src/Consolonia.NUnit/ConsoloniaAppTestBase.cs
@@ -70,7 +70,7 @@ await Task.Run(async () =>
                     {
                         Window mainWindow = _lifetime?.MainWindow;
                         return mainWindow != null;
-                    }).GetTask().ConfigureAwait(false);
+                    });
                     if (windowFound)
                         return;
                 }
diff --git a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
index e8625986..0a5c6c47 100644
--- a/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
+++ b/src/Consolonia.Themes.TurboVision/Consolonia.Themes.TurboVision.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-    
+
     <ItemGroup>
       <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     </ItemGroup>
@@ -10,10 +10,4 @@
       <ProjectReference Include="..\Consolonia.Core\Consolonia.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Templates\Controls\DialogWrap.axaml.cs">
-        <DependentUpon>DialogWrap.axaml</DependentUpon>
-      </Compile>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
index 0627a67c..fa08b57f 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/DialogWindow.axaml
@@ -1,10 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog"
+        xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core"
         xmlns:drawing="clr-namespace:Consolonia.Core.Drawing;assembly=Consolonia.Core"
         xmlns:helpers="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Helpers">
 
-    <Style Selector=":is(dialog|DialogWindow)">
+    <Style Selector=":is(controls|DialogWindow)">
         <Style.Resources>
             <Thickness x:Key="ConsoloniaDialogWindowBorderMargin">1,0</Thickness>
         </Style.Resources>
@@ -22,7 +22,7 @@
                 Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="dialog:DialogWindow">
+                <ControlTemplate TargetType="controls:DialogWindow">
                     <Panel>
                         <!--Centered layout-->
                         <!--Panel shade Mode=Shaded-->
@@ -57,27 +57,27 @@
                                     IsHitTestVisible="False"
                                     Margin="{TemplateBinding Padding}" />
                             </Border>
-                            <StackPanel HorizontalAlignment="Center"
+                            <StackPanel HorizontalAlignment="Left"
                                         VerticalAlignment="Top"
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         ZIndex="10"
                                         Orientation="Horizontal">
-                                <helpers:SymbolsControl Text=" "
-                                                        Foreground="{TemplateBinding BorderBrush}" />
-                                <TextBlock Text="{TemplateBinding Title}" />
-                                <helpers:SymbolsControl Text=" "
+                                <helpers:SymbolsControl Text="{TemplateBinding Icon}"
+                                                        IsVisible="{Binding Icon.Length}"
                                                         Foreground="{TemplateBinding BorderBrush}" />
+                                <TextBlock Text="{TemplateBinding Title}"
+                                           Margin="1 0 0 0" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal"
                                         ZIndex="10"
                                         VerticalAlignment="Top"
+                                        HorizontalAlignment="Right"
                                         Margin="{DynamicResource ConsoloniaDialogWindowBorderMargin}"
                                         IsVisible="{TemplateBinding IsCloseButtonVisible}">
-                                <Button Content="x"
+                                <Button Content="×"
                                         Background="{x:Null}"
                                         IsTabStop="False"
                                         Padding="0"
-                                        Margin="2,0,0,0"
                                         Command="{Binding Path=CloseClick, RelativeSource={RelativeSource TemplatedParent}}">
                                     <Button.Styles>
                                         <Style Selector="Button">
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
index 04c1e199..5aad9256 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Helpers/SymbolsControl.cs
@@ -6,6 +6,7 @@
 using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Media.TextFormatting;
+using Consolonia.Core.Helpers;
 using Consolonia.Core.Text;
 using TextShaper = Consolonia.Core.Text.TextShaper;
 
@@ -92,15 +93,18 @@ public override void Render(DrawingContext context)
             }
             else
             {
-                var formattedText = new FormattedText(
-                    string.Concat(
-                        Enumerable.Repeat(
-                            Text?[0] ?? ' ', (int)Bounds.Width)),
-                    CultureInfo.CurrentCulture,
-                    FlowDirection.LeftToRight,
-                    Typeface.Default, 1, Foreground);
-                for (int y = 0; y < Bounds.Height; y++)
-                    context.DrawText(formattedText, new Point(0, y));
+                if (Text != null && Text.Length > 0)
+                {
+                    // Draw the text as a repeating pattern
+                    var formattedText = new FormattedText(
+                        string.Concat(
+                            Enumerable.Repeat(Text, (int)Bounds.Width / Text.MeasureText())),
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        Typeface.Default, 1, Foreground);
+                    for (int y = 0; y < Bounds.Height; y++)
+                        context.DrawText(formattedText, new Point(0, y));
+                }
             }
         }
 
diff --git a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
index 041ca03d..98995b5e 100644
--- a/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
+++ b/src/Consolonia.Themes.TurboVision/Templates/Controls/Window.axaml
@@ -1,5 +1,5 @@
 <Style xmlns="https://github.com/avaloniaui"
-       xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog"
+       xmlns:dialog="clr-namespace:Consolonia.Core.Controls.Dialog;assembly=Consolonia.Core"
        Selector="Window">
     <Setter Property="Background"
             Value="{DynamicResource ThemeBackgroundBrush}" />
diff --git a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
index 9a8e5c2d..5d5a9475 100644
--- a/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
+++ b/src/Consolonia.Themes.TurboVision/Themes/TurboVisionDark/Controls/DialogWindow.axaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialog="clr-namespace:Consolonia.Themes.TurboVision.Templates.Controls.Dialog">
-    <Style Selector=":is(dialog|DialogWindow)">
+        xmlns:controls="clr-namespace:Consolonia.Core.Controls;assembly=Consolonia.Core">
+    <Style Selector=":is(controls|DialogWindow)">
         <Setter Property="Background"
                 Value="{DynamicResource ThemeBackgroundBrush}" />
     </Style>
diff --git a/src/Example/App.axaml.cs b/src/Example/App.axaml.cs
index 7e3efd47..fb382a2c 100644
--- a/src/Example/App.axaml.cs
+++ b/src/Example/App.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
 using Consolonia.Core.Infrastructure;
 using Example.Views;
 
@@ -8,11 +7,6 @@ namespace Example
     // ReSharper disable once PartialTypeWithSinglePart
     public partial class App : ConsoloniaApplication
     {
-        public override void Initialize()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
diff --git a/src/Example/Views/DataGridTestWindow.axaml b/src/Example/Views/DataGridTestWindow.axaml
index bcc538d1..775b2260 100644
--- a/src/Example/Views/DataGridTestWindow.axaml
+++ b/src/Example/Views/DataGridTestWindow.axaml
@@ -94,7 +94,7 @@
                             Grid.ColumnSpan="2"
                             Grid.Column="0"
                             HorizontalAlignment="Center"
-                            Click="delete_Clicked" />
+                            Click="Delete_Clicked" />
 
                 </Grid>
             </Border>
diff --git a/src/Example/Views/DataGridTestWindow.axaml.cs b/src/Example/Views/DataGridTestWindow.axaml.cs
index a67069b0..2953137c 100644
--- a/src/Example/Views/DataGridTestWindow.axaml.cs
+++ b/src/Example/Views/DataGridTestWindow.axaml.cs
@@ -5,7 +5,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
 namespace Example.Views
 {
@@ -20,8 +19,7 @@ public DataGridTestWindow()
             this.AttachDevTools();
 #endif
 
-            var comboBox = this.FindControl<ComboBox>("Combo");
-            comboBox.ItemsSource = TheItem.Genres;
+            Combo.ItemsSource = TheItem.Genres;
             var rnd = new Random();
 
             DataContext = _items = new ObservableCollection<TheItem>(Enumerable.Range(1, 50).Select(i => new TheItem
@@ -43,13 +41,9 @@ private async void SetSelectedAsync()
             grid.Focus();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         // ReSharper disable once UnusedParameter.Local //todo: think to remove this rule
-        private void delete_Clicked(object sender, RoutedEventArgs _)
+        private void Delete_Clicked(object sender, RoutedEventArgs _)
         {
             _items.Remove((TheItem)((Control)sender).DataContext);
         }
diff --git a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
index a237a748..63d154b2 100644
--- a/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
+++ b/src/Tests/Consolonia.Core.Tests/Consolonia.Core.Tests.csproj
@@ -6,6 +6,7 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
+
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
new file mode 100644
index 00000000..ec85480f
--- /dev/null
+++ b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -0,0 +1,172 @@
+// ReSharper disable PossibleNullReferenceException
+// ReSharper disable ConstantConditionalAccessQualifier
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Consolonia.Core.Infrastructure;
+using NUnit.Framework;
+
+namespace Consolonia.Core.Tests
+{
+    [TestFixture]
+    public class StorageTests
+    {
+        [Test]
+        public void DefaultAttributes()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            Assert.True(storageProvider.CanOpen);
+            Assert.True(storageProvider.CanSave);
+            Assert.True(storageProvider.CanPickFolder);
+        }
+
+        [Test]
+        public async Task TestFileSemantics()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            string tempFile = Path.GetTempFileName();
+            IStorageFile file = await storageProvider.TryGetFileFromPathAsync(new Uri($"file://{tempFile}"));
+            Assert.IsNotNull(file);
+            Assert.AreEqual(tempFile, file.Path.LocalPath);
+
+            using (Stream stream = await file.OpenWriteAsync())
+            {
+                using (var streamWriter = new StreamWriter(stream))
+                {
+                    await streamWriter.WriteAsync("Hello world");
+                }
+            }
+
+            Assert.True(File.Exists(tempFile));
+            Assert.True(File.Exists(file.Path.LocalPath));
+            StorageItemProperties props = await file.GetBasicPropertiesAsync();
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
+
+            using (Stream stream = await file.OpenReadAsync())
+            {
+                using (var streamReader = new StreamReader(stream))
+                {
+                    string text = await streamReader.ReadToEndAsync();
+                    Assert.AreEqual("Hello world", text);
+                }
+            }
+
+            props = await file.GetBasicPropertiesAsync();
+            Assert.AreEqual(File.GetCreationTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(File.GetLastWriteTime(tempFile).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(new FileInfo(tempFile).Length, (long)(props.Size ?? 0));
+
+            IStorageFolder parentFolder = await file.GetParentAsync();
+            Assert.IsNotNull(parentFolder);
+            Assert.AreEqual(Path.GetDirectoryName(tempFile), parentFolder.Path.LocalPath);
+
+            string subPath = Path.Combine(Path.GetDirectoryName(tempFile)!, nameof(TestFileSemantics));
+            if (Directory.Exists(subPath))
+                Directory.Delete(subPath);
+
+            IStorageFolder subFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{subPath}"));
+            Assert.IsNull(subFolder);
+
+            subFolder = await parentFolder.CreateFolderAsync(nameof(TestFileSemantics));
+            Assert.IsNotNull(subFolder);
+            Assert.IsTrue(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
+
+            IStorageItem newFile = await file.MoveAsync(subFolder);
+            Assert.True(File.Exists(newFile.Path?.LocalPath));
+            Assert.False(File.Exists(tempFile));
+            Assert.AreEqual(
+                new Uri(
+                    $"file://{parentFolder.Path.LocalPath}/{nameof(TestFileSemantics)}/{Path.GetFileName(tempFile)}"),
+                newFile.Path);
+            await newFile.DeleteAsync();
+            Assert.False(File.Exists(newFile.Path.LocalPath));
+
+            await subFolder.DeleteAsync();
+            Assert.IsFalse(new DirectoryInfo(subFolder.Path.LocalPath).Exists);
+        }
+
+        [Test]
+        public async Task TestWellKnownFolder()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            IStorageFolder folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Pictures);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Documents);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                    folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Music);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Videos);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
+            if (folder != null)
+                Assert.AreEqual(
+                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                    folder.Path.LocalPath);
+
+            folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);
+            if (folder != null)
+                Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), folder.Path.LocalPath);
+        }
+
+
+        [Test]
+        public async Task TestFolderSemantics()
+        {
+            var storageProvider = new ConsoloniaStorageProvider();
+            string tempPath = Path.GetTempPath();
+            IStorageFolder tempFolder = await storageProvider.TryGetFolderFromPathAsync(new Uri($"file://{tempPath}"));
+            string testPath = Path.Combine(tempPath, nameof(TestFolderSemantics))!;
+            IStorageFolder testFolder = await tempFolder.CreateFolderAsync(nameof(TestFolderSemantics));
+
+            Assert.IsNotNull(testFolder);
+            Assert.AreEqual(testPath, testFolder.Path.LocalPath);
+            Assert.IsFalse(testFolder.CanBookmark);
+            Assert.AreEqual(nameof(TestFolderSemantics), testFolder.Name);
+            IStorageFile file = await testFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
+
+            StorageItemProperties props = await testFolder.GetBasicPropertiesAsync();
+            Assert.AreEqual(Directory.GetCreationTime(testPath).ToString("G", CultureInfo.InvariantCulture),
+                props.DateCreated?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+            Assert.AreEqual(Directory.GetLastWriteTime(testPath).ToString("G", CultureInfo.InvariantCulture),
+                props.DateModified?.DateTime.ToString("G", CultureInfo.InvariantCulture));
+
+            await file.DeleteAsync();
+            Assert.IsFalse(File.Exists(file.Path?.LocalPath));
+
+            IStorageFolder subFolder = await testFolder.CreateFolderAsync("sub");
+            Assert.IsTrue(Directory.Exists(subFolder.Path?.LocalPath));
+
+            file = await subFolder.CreateFileAsync($"{nameof(TestFolderSemantics)}.txt");
+            Assert.IsTrue(File.Exists(file.Path?.LocalPath));
+
+            await foreach (IStorageItem item in subFolder.GetItemsAsync())
+                Assert.AreEqual(file.Path.LocalPath, item.Path.LocalPath);
+            await file.DeleteAsync();
+
+            await subFolder.DeleteAsync();
+            Assert.IsFalse(Directory.Exists(subFolder.Path.LocalPath));
+
+            await testFolder.DeleteAsync();
+            Assert.IsFalse(Directory.Exists(testPath));
+        }
+    }
+}
\ No newline at end of file