From c5e6cbf7bde904538ce22e858dfa476370e20c48 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Tue, 30 May 2023 23:07:30 +0800
Subject: [PATCH] remove separate initializecomponent call.

---
 ControlCatalogStandalone.Browser/Program.cs   |  2 --
 .../DecoratedWindow.axaml.cs                  |  4 ++--
 ControlCatalogStandalone/MainWindow.axaml.cs  |  4 ----
 .../Pages/AcrylicPage.axaml.cs                |  4 ----
 .../Pages/AdornerLayerPage.axaml.cs           |  6 +----
 .../Pages/AutoCompleteBoxPage.axaml.cs        |  7 +-----
 .../Pages/BorderPage.axaml.cs                 |  7 +-----
 .../Pages/ButtonSpinnerPage.axaml.cs          |  6 +----
 .../Pages/ButtonsPage.axaml.cs                |  4 ----
 .../Pages/CalendarDatePickerPage.axaml.cs     |  4 ----
 .../Pages/CalendarPage.axaml.cs               |  6 +----
 .../Pages/CanvasPage.axaml.cs                 |  6 +----
 .../Pages/CheckBoxPage.axaml.cs               |  6 +----
 .../Pages/ClipboardPage.axaml.cs              |  6 +----
 .../Pages/ColorPickerPage.axaml.cs            |  4 ----
 .../Pages/ComboBoxPage.axaml.cs               |  2 +-
 .../Pages/ContextFlyoutPage.axaml.cs          |  4 ----
 .../Pages/ContextMenuPage.axaml.cs            |  6 +----
 .../Pages/CursorPage.axaml.cs                 |  6 +----
 .../Pages/CustomDrawingExampleControl.cs      | 22 +++++++++----------
 .../Pages/DataGridPage.axaml.cs               |  6 +----
 .../Pages/DateTimePickerPage.axaml.cs         |  6 +----
 .../Pages/DialogsPage.axaml.cs                |  6 +----
 .../Pages/DragAndDropPage.axaml.cs            |  8 ++-----
 .../Pages/ExpanderPage.axaml.cs               |  6 +----
 .../Pages/GesturePage.axaml.cs                |  8 ++-----
 .../Pages/ImagePage.axaml.cs                  |  4 ----
 .../Pages/LabelsPage.axaml.cs                 |  2 +-
 .../Pages/LayoutTransformControlPage.axaml.cs |  6 +----
 .../Pages/ListBoxPage.axaml.cs                |  4 ----
 .../Pages/MenuPage.axaml.cs                   |  6 +----
 .../Pages/NativeEmbedPage.axaml.cs            |  6 +----
 .../Pages/NotificationsPage.axaml.cs          |  6 +----
 .../Pages/NumericUpDownPage.axaml.cs          | 12 ++++------
 .../Pages/PlatformInfoPage.axaml.cs           |  6 +----
 .../Pages/PointersPage.axaml.cs               |  2 +-
 .../Pages/ProgressBarPage.axaml.cs            |  6 +----
 .../Pages/RadioButtonPage.axaml.cs            |  6 +----
 .../Pages/ScrollViewerPage.axaml.cs           | 18 ++++++---------
 .../Pages/SliderPage.axaml.cs                 |  6 +----
 .../Pages/SplitViewPage.axaml.cs              |  6 +----
 .../Pages/TabControlPage.axaml.cs             |  4 ----
 .../Pages/TabStripPage.axaml.cs               |  4 ----
 .../Pages/TextBlockPage.axaml.cs              |  6 +----
 .../Pages/TextBoxPage.axaml.cs                |  6 +----
 .../Pages/ToggleSwitchPage.axaml.cs           |  6 +----
 .../Pages/ToolTipPage.axaml.cs                |  6 +----
 .../TransitioningContentControlPage.axaml.cs  |  4 ----
 .../Pages/TreeViewPage.axaml.cs               |  4 ----
 .../Pages/ViewboxPage.axaml.cs                |  4 ----
 .../Pages/WindowCustomizationsPage.axaml.cs   |  6 +----
 .../ViewModels/MainWindowViewModel.cs         |  4 ++--
 .../ViewModels/NotificationViewModel.cs       |  8 +++----
 .../Views/CustomNotificationView.axaml.cs     |  6 +----
 54 files changed, 66 insertions(+), 254 deletions(-)

diff --git a/ControlCatalogStandalone.Browser/Program.cs b/ControlCatalogStandalone.Browser/Program.cs
index 662c9f8..58eeb37 100644
--- a/ControlCatalogStandalone.Browser/Program.cs
+++ b/ControlCatalogStandalone.Browser/Program.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
-using Avalonia.ReactiveUI;
 using ControlCatalogStandalone;
 
 [assembly: SupportedOSPlatform("browser")]
@@ -11,7 +10,6 @@ internal partial class Program
 {
     private static async Task Main(string[] args) => await BuildAvaloniaApp()
             .WithInterFont()
-            .UseReactiveUI()
             .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()
diff --git a/ControlCatalogStandalone/DecoratedWindow.axaml.cs b/ControlCatalogStandalone/DecoratedWindow.axaml.cs
index d96124d..bda4f7c 100644
--- a/ControlCatalogStandalone/DecoratedWindow.axaml.cs
+++ b/ControlCatalogStandalone/DecoratedWindow.axaml.cs
@@ -10,7 +10,7 @@ namespace ControlCatalogStandalone
     {
         public DecoratedWindow()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         void SetupSide(string name, StandardCursorType cursor, WindowEdge edge)
@@ -38,7 +38,7 @@ namespace ControlCatalogStandalone
             SetupSide("TopRight", StandardCursorType.TopRightCorner, WindowEdge.NorthEast);
             SetupSide("BottomLeft", StandardCursorType.BottomLeftCorner, WindowEdge.SouthWest);
             SetupSide("BottomRight", StandardCursorType.BottomRightCorner, WindowEdge.SouthEast);
-            this.Get<Button>("MinimizeButton").Click += delegate { this.WindowState = WindowState.Minimized; };
+            this.Get<Button>("MinimizeButton").Click += delegate { WindowState = WindowState.Minimized; };
             this.Get<Button>("MaximizeButton").Click += delegate
             {
                 WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
diff --git a/ControlCatalogStandalone/MainWindow.axaml.cs b/ControlCatalogStandalone/MainWindow.axaml.cs
index d10f045..d524fc8 100644
--- a/ControlCatalogStandalone/MainWindow.axaml.cs
+++ b/ControlCatalogStandalone/MainWindow.axaml.cs
@@ -35,9 +35,5 @@ namespace ControlCatalogStandalone
             Close();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/AcrylicPage.axaml.cs b/ControlCatalogStandalone/Pages/AcrylicPage.axaml.cs
index 35d20aa..b2a522a 100644
--- a/ControlCatalogStandalone/Pages/AcrylicPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/AcrylicPage.axaml.cs
@@ -11,9 +11,5 @@ namespace ControlCatalogStandalone.Pages
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/AdornerLayerPage.axaml.cs b/ControlCatalogStandalone/Pages/AdornerLayerPage.axaml.cs
index caf345a..7e2dc99 100644
--- a/ControlCatalogStandalone/Pages/AdornerLayerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/AdornerLayerPage.axaml.cs
@@ -11,13 +11,9 @@ namespace ControlCatalogStandalone.Pages
 
         public AdornerLayerPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         private void RemoveAdorner_OnClick(object? sender, RoutedEventArgs e)
         {
diff --git a/ControlCatalogStandalone/Pages/AutoCompleteBoxPage.axaml.cs b/ControlCatalogStandalone/Pages/AutoCompleteBoxPage.axaml.cs
index d3d63b3..6ec205c 100644
--- a/ControlCatalogStandalone/Pages/AutoCompleteBoxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/AutoCompleteBoxPage.axaml.cs
@@ -107,7 +107,7 @@ namespace ControlCatalogStandalone.Pages
 
         public AutoCompleteBoxPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             States = BuildAllStates();
             Sentences = BuildAllSentences();
@@ -196,10 +196,5 @@ namespace ControlCatalogStandalone.Pages
             }
             return string.Empty;
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/BorderPage.axaml.cs b/ControlCatalogStandalone/Pages/BorderPage.axaml.cs
index c728de4..d93c139 100644
--- a/ControlCatalogStandalone/Pages/BorderPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/BorderPage.axaml.cs
@@ -7,12 +7,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public BorderPage()
         {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
+            InitializeComponent();
         }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ButtonSpinnerPage.axaml.cs b/ControlCatalogStandalone/Pages/ButtonSpinnerPage.axaml.cs
index 9735374..2f2fea9 100644
--- a/ControlCatalogStandalone/Pages/ButtonSpinnerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ButtonSpinnerPage.axaml.cs
@@ -10,13 +10,9 @@ namespace ControlCatalogStandalone.Pages
     {
         public ButtonSpinnerPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         public void OnSpin(object sender, SpinEventArgs e)
         {
diff --git a/ControlCatalogStandalone/Pages/ButtonsPage.axaml.cs b/ControlCatalogStandalone/Pages/ButtonsPage.axaml.cs
index 5db7657..8dec45c 100644
--- a/ControlCatalogStandalone/Pages/ButtonsPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ButtonsPage.axaml.cs
@@ -14,10 +14,6 @@ namespace ControlCatalogStandalone.Pages
             this.Get<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         public void OnRepeatButtonClick(object? sender, object args)
         {
diff --git a/ControlCatalogStandalone/Pages/CalendarDatePickerPage.axaml.cs b/ControlCatalogStandalone/Pages/CalendarDatePickerPage.axaml.cs
index c7e4f04..50580c0 100644
--- a/ControlCatalogStandalone/Pages/CalendarDatePickerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/CalendarDatePickerPage.axaml.cs
@@ -28,9 +28,5 @@ namespace ControlCatalogStandalone.Pages
             
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/CalendarPage.axaml.cs b/ControlCatalogStandalone/Pages/CalendarPage.axaml.cs
index addf959..92a9575 100644
--- a/ControlCatalogStandalone/Pages/CalendarPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/CalendarPage.axaml.cs
@@ -8,7 +8,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public CalendarPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             var today = DateTime.Today; 
             var cal1 = this.Get<Calendar>("DisplayDatesCalendar");
@@ -20,9 +20,5 @@ namespace ControlCatalogStandalone.Pages
             cal2.BlackoutDates.Add(new CalendarDateRange(today.AddDays(6)));
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/CanvasPage.axaml.cs b/ControlCatalogStandalone/Pages/CanvasPage.axaml.cs
index 4d274d2..83e5c03 100644
--- a/ControlCatalogStandalone/Pages/CanvasPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/CanvasPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public CanvasPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/CheckBoxPage.axaml.cs b/ControlCatalogStandalone/Pages/CheckBoxPage.axaml.cs
index 51e21dd..63f0a6c 100644
--- a/ControlCatalogStandalone/Pages/CheckBoxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/CheckBoxPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public CheckBoxPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ClipboardPage.axaml.cs b/ControlCatalogStandalone/Pages/ClipboardPage.axaml.cs
index 78f1dcb..8f854d5 100644
--- a/ControlCatalogStandalone/Pages/ClipboardPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ClipboardPage.axaml.cs
@@ -23,10 +23,6 @@ namespace ControlCatalogStandalone.Pages
             InitializeComponent();
         }
         
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         private async void CopyText(object? sender, RoutedEventArgs args)
         {
@@ -110,7 +106,7 @@ namespace ControlCatalogStandalone.Pages
         {
             if (TopLevel.GetTopLevel(this)?.Clipboard is { } clipboard)
             {
-                var files = await clipboard.GetDataAsync(DataFormats.Files) as IEnumerable<Avalonia.Platform.Storage.IStorageItem>;
+                var files = await clipboard.GetDataAsync(DataFormats.Files) as IEnumerable<IStorageItem>;
 
                 ClipboardContent.Text = files != null ? string.Join(Environment.NewLine, files.Select(f => f.TryGetLocalPath() ?? f.Name)) : string.Empty;
             }
diff --git a/ControlCatalogStandalone/Pages/ColorPickerPage.axaml.cs b/ControlCatalogStandalone/Pages/ColorPickerPage.axaml.cs
index e4235a4..edeaa7b 100644
--- a/ControlCatalogStandalone/Pages/ColorPickerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ColorPickerPage.axaml.cs
@@ -28,9 +28,5 @@ namespace ControlCatalogStandalone.Pages
             layoutRoot.Children.Add(colorPicker);
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ComboBoxPage.axaml.cs b/ControlCatalogStandalone/Pages/ComboBoxPage.axaml.cs
index 7407928..4e7157e 100644
--- a/ControlCatalogStandalone/Pages/ComboBoxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ComboBoxPage.axaml.cs
@@ -10,7 +10,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public ComboBoxPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new ComboBoxPageViewModel();
         }
 
diff --git a/ControlCatalogStandalone/Pages/ContextFlyoutPage.axaml.cs b/ControlCatalogStandalone/Pages/ContextFlyoutPage.axaml.cs
index 224fee0..1ed1a5a 100644
--- a/ControlCatalogStandalone/Pages/ContextFlyoutPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ContextFlyoutPage.axaml.cs
@@ -84,9 +84,5 @@ namespace ControlCatalogStandalone.Pages
             }
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ContextMenuPage.axaml.cs b/ControlCatalogStandalone/Pages/ContextMenuPage.axaml.cs
index d703e96..532cbcf 100644
--- a/ControlCatalogStandalone/Pages/ContextMenuPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ContextMenuPage.axaml.cs
@@ -12,7 +12,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public ContextMenuPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new ContextPageViewModel();
 
             var customContextRequestedBorder = this.Get<Border>("CustomContextRequestedBorder");
@@ -62,9 +62,5 @@ namespace ControlCatalogStandalone.Pages
 
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/CursorPage.axaml.cs b/ControlCatalogStandalone/Pages/CursorPage.axaml.cs
index ff47b69..ae8c1c8 100644
--- a/ControlCatalogStandalone/Pages/CursorPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/CursorPage.axaml.cs
@@ -8,13 +8,9 @@ namespace ControlCatalogStandalone.Pages
     {
         public CursorPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new CursorPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/CustomDrawingExampleControl.cs b/ControlCatalogStandalone/Pages/CustomDrawingExampleControl.cs
index f8214d7..487ad34 100644
--- a/ControlCatalogStandalone/Pages/CustomDrawingExampleControl.cs
+++ b/ControlCatalogStandalone/Pages/CustomDrawingExampleControl.cs
@@ -120,26 +120,26 @@ namespace ControlCatalogStandalone.Pages
 
         public override void Render(DrawingContext context)
         {
-            var localBounds = new Rect(new Size(this.Bounds.Width, this.Bounds.Height));
-            var clip = context.PushClip(this.Bounds);
+            var localBounds = new Rect(new Size(Bounds.Width, Bounds.Height));
+            var clip = context.PushClip(Bounds);
             context.DrawRectangle(Brushes.White, _pen, localBounds, 1.0d);
 
-            var halfMax = Math.Max(this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d) * Math.Sqrt(2.0d);
-            var halfMin = Math.Min(this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d) / 1.3d;
-            var halfWidth = this.Bounds.Width / 2.0d;
-            var halfHeight = this.Bounds.Height / 2.0d;
+            var halfMax = Math.Max(Bounds.Width / 2.0d, Bounds.Height / 2.0d) * Math.Sqrt(2.0d);
+            var halfMin = Math.Min(Bounds.Width / 2.0d, Bounds.Height / 2.0d) / 1.3d;
+            var halfWidth = Bounds.Width / 2.0d;
+            var halfHeight = Bounds.Height / 2.0d;
 
             // 0,0 refers to the top-left of the control now. It is not prime time to draw gui stuff because it'll be under the world 
 
-            var translateModifier = context.PushTransform(Avalonia.Matrix.CreateTranslation(new Avalonia.Vector(halfWidth, halfHeight)));
+            var translateModifier = context.PushTransform(Matrix.CreateTranslation(new Vector(halfWidth, halfHeight)));
 
             // now 0,0 refers to the ViewportCenter(X,Y). 
-            var rotationMatrix = Avalonia.Matrix.CreateRotation(Rotation);
+            var rotationMatrix = Matrix.CreateRotation(Rotation);
             var rotationModifier = context.PushTransform(rotationMatrix);
 
             // everything is rotated but not scaled 
 
-            var scaleModifier = context.PushTransform(Avalonia.Matrix.CreateScale(Scale, -Scale));
+            var scaleModifier = context.PushTransform(Matrix.CreateScale(Scale, -Scale));
 
             var mapPositionModifier = context.PushTransform(Matrix.CreateTranslation(new Vector(-ViewportCenterX, -ViewportCenterY)));
 
@@ -188,7 +188,7 @@ namespace ControlCatalogStandalone.Pages
         private Point UIPointToWorldPoint(Point inPoint, double viewportCenterX, double viewportCenterY, double scale, double rotation)
         {
             Point workingPoint = new Point(inPoint.X, -inPoint.Y);
-            workingPoint += new Vector(-this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d);
+            workingPoint += new Vector(-Bounds.Width / 2.0d, Bounds.Height / 2.0d);
             workingPoint /= scale;
 
             workingPoint = Matrix.CreateRotation(rotation).Transform(workingPoint);
@@ -206,7 +206,7 @@ namespace ControlCatalogStandalone.Pages
             // undo rotation
             workingPoint = Matrix.CreateRotation(-rotation).Transform(workingPoint);
             workingPoint *= scale;
-            workingPoint -= new Vector(-this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d);
+            workingPoint -= new Vector(-Bounds.Width / 2.0d, Bounds.Height / 2.0d);
             workingPoint = new Point(workingPoint.X, -workingPoint.Y);
 
             return workingPoint;
diff --git a/ControlCatalogStandalone/Pages/DataGridPage.axaml.cs b/ControlCatalogStandalone/Pages/DataGridPage.axaml.cs
index b507d02..c5b8cd4 100644
--- a/ControlCatalogStandalone/Pages/DataGridPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/DataGridPage.axaml.cs
@@ -17,7 +17,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public DataGridPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             var dataGridSortDescription = DataGridSortDescription.FromPath(nameof(Country.Region), ListSortDirection.Ascending, new ReversedStringComparer());
             var collectionView1 = new DataGridCollectionView(Countries.All);
@@ -70,10 +70,6 @@ namespace ControlCatalogStandalone.Pages
             e.Row.Header = e.Row.GetIndex() + 1;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         private class ReversedStringComparer : IComparer<object>, IComparer
         {
diff --git a/ControlCatalogStandalone/Pages/DateTimePickerPage.axaml.cs b/ControlCatalogStandalone/Pages/DateTimePickerPage.axaml.cs
index ff69d30..3945ece 100644
--- a/ControlCatalogStandalone/Pages/DateTimePickerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/DateTimePickerPage.axaml.cs
@@ -8,7 +8,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public DateTimePickerPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             this.Get<TextBlock>("DatePickerDesc").Text = "Use a DatePicker to let users set a date in your app, " +
                 "for example to schedule an appointment. The DatePicker displays three controls for month, day, and year. " +
                 "These controls are easy to use with touch or mouse, and they can be styled and configured in several different ways. " +
@@ -22,9 +22,5 @@ namespace ControlCatalogStandalone.Pages
 
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/DialogsPage.axaml.cs b/ControlCatalogStandalone/Pages/DialogsPage.axaml.cs
index d624f3d..c1a3266 100644
--- a/ControlCatalogStandalone/Pages/DialogsPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/DialogsPage.axaml.cs
@@ -22,7 +22,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public DialogsPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             IStorageFolder? lastSelectedDirectory = null;
             bool ignoreTextChanged = false;
@@ -439,10 +439,6 @@ CanPickFolder: {storageProvider.CanPickFolder}";
         Window GetWindow() => TopLevel.GetTopLevel(this) as Window ?? throw new NullReferenceException("Invalid Owner");
         TopLevel GetTopLevel() => TopLevel.GetTopLevel(this) ?? throw new NullReferenceException("Invalid Owner");
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
 #pragma warning restore CS0618 // Type or member is obsolete
diff --git a/ControlCatalogStandalone/Pages/DragAndDropPage.axaml.cs b/ControlCatalogStandalone/Pages/DragAndDropPage.axaml.cs
index 8f125ca..5001a56 100644
--- a/ControlCatalogStandalone/Pages/DragAndDropPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/DragAndDropPage.axaml.cs
@@ -14,7 +14,7 @@ namespace ControlCatalogStandalone.Pages
         private const string CustomFormat = "application/xxx-avalonia-ControlCatalogStandalone-custom";
         public DragAndDropPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             _dropState = this.Get<TextBlock>("DropState");
 
             int textCount = 0;
@@ -30,7 +30,7 @@ namespace ControlCatalogStandalone.Pages
             var dragMe = this.Get<Border>("DragMe" + suffix);
             var dragState = this.Get<TextBlock>("DragState" + suffix);
 
-            async void DoDrag(object? sender, Avalonia.Input.PointerPressedEventArgs e)
+            async void DoDrag(object? sender, PointerPressedEventArgs e)
             {
                 var dragData = new DataObject();
                 factory(dragData);
@@ -133,9 +133,5 @@ namespace ControlCatalogStandalone.Pages
             AddHandler(DragDrop.DragOverEvent, DragOver);
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ExpanderPage.axaml.cs b/ControlCatalogStandalone/Pages/ExpanderPage.axaml.cs
index cd46272..0a97891 100644
--- a/ControlCatalogStandalone/Pages/ExpanderPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ExpanderPage.axaml.cs
@@ -8,7 +8,7 @@ namespace ControlCatalogStandalone.Pages
     {
         public ExpanderPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new ExpanderPageViewModel();
 
             var CollapsingDisabledExpander = this.Get<Expander>("CollapsingDisabledExpander");
@@ -18,9 +18,5 @@ namespace ControlCatalogStandalone.Pages
             ExpandingDisabledExpander.Expanding += (s, e) => { e.Cancel = true; };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/GesturePage.axaml.cs b/ControlCatalogStandalone/Pages/GesturePage.axaml.cs
index 91a7467..a384899 100644
--- a/ControlCatalogStandalone/Pages/GesturePage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/GesturePage.axaml.cs
@@ -17,13 +17,9 @@ namespace ControlCatalogStandalone.Pages
 
         public GesturePage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
@@ -185,7 +181,7 @@ namespace ControlCatalogStandalone.Pages
                 InitComposition(ball!);
                 if (ballCompositionVisual != null)
                 {
-                    ballCompositionVisual.Offset = defaultOffset + new System.Numerics.Vector3((float)e.Delta.X * 0.4f, (float)e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1);
+                    ballCompositionVisual.Offset = defaultOffset + new Vector3((float)e.Delta.X * 0.4f, (float)e.Delta.Y * 0.4f, 0) * (inverse ? -1 : 1);
 
                     e.Handled = true;
                 }
diff --git a/ControlCatalogStandalone/Pages/ImagePage.axaml.cs b/ControlCatalogStandalone/Pages/ImagePage.axaml.cs
index 626fe4b..7fbe2d1 100644
--- a/ControlCatalogStandalone/Pages/ImagePage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ImagePage.axaml.cs
@@ -22,10 +22,6 @@ namespace ControlCatalogStandalone.Pages
             _croppedImage = this.Get<Image>("croppedImage");
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         public void BitmapStretchChanged(object sender, SelectionChangedEventArgs e)
         {
diff --git a/ControlCatalogStandalone/Pages/LabelsPage.axaml.cs b/ControlCatalogStandalone/Pages/LabelsPage.axaml.cs
index cd14328..6a35fa6 100644
--- a/ControlCatalogStandalone/Pages/LabelsPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/LabelsPage.axaml.cs
@@ -10,7 +10,7 @@ namespace ControlCatalogStandalone.Pages
         public LabelsPage()
         {
             CreateDefaultPerson();
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         private void CreateDefaultPerson()
diff --git a/ControlCatalogStandalone/Pages/LayoutTransformControlPage.axaml.cs b/ControlCatalogStandalone/Pages/LayoutTransformControlPage.axaml.cs
index 69df604..c049366 100644
--- a/ControlCatalogStandalone/Pages/LayoutTransformControlPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/LayoutTransformControlPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public LayoutTransformControlPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ListBoxPage.axaml.cs b/ControlCatalogStandalone/Pages/ListBoxPage.axaml.cs
index 67b7d4f..d72c7f2 100644
--- a/ControlCatalogStandalone/Pages/ListBoxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ListBoxPage.axaml.cs
@@ -12,9 +12,5 @@ namespace ControlCatalogStandalone.Pages
             DataContext = new ListBoxPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/MenuPage.axaml.cs b/ControlCatalogStandalone/Pages/MenuPage.axaml.cs
index 3bd8592..d0e2b46 100644
--- a/ControlCatalogStandalone/Pages/MenuPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/MenuPage.axaml.cs
@@ -12,14 +12,10 @@ namespace ControlCatalogStandalone.Pages
     {
         public MenuPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new MenuPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
         
         private MenuPageViewModel? _model;
         protected override void OnDataContextChanged(EventArgs e)
diff --git a/ControlCatalogStandalone/Pages/NativeEmbedPage.axaml.cs b/ControlCatalogStandalone/Pages/NativeEmbedPage.axaml.cs
index e83bd24..c4e481f 100644
--- a/ControlCatalogStandalone/Pages/NativeEmbedPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/NativeEmbedPage.axaml.cs
@@ -15,13 +15,9 @@ namespace ControlCatalogStandalone.Pages
     {
         public NativeEmbedPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         public async void ShowPopupDelay(object sender, RoutedEventArgs args)
         {
diff --git a/ControlCatalogStandalone/Pages/NotificationsPage.axaml.cs b/ControlCatalogStandalone/Pages/NotificationsPage.axaml.cs
index aa9888f..8a798e1 100644
--- a/ControlCatalogStandalone/Pages/NotificationsPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/NotificationsPage.axaml.cs
@@ -11,17 +11,13 @@ namespace ControlCatalogStandalone.Pages
 
         public NotificationsPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             _viewModel = new NotificationViewModel();
 
             DataContext = _viewModel;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
diff --git a/ControlCatalogStandalone/Pages/NumericUpDownPage.axaml.cs b/ControlCatalogStandalone/Pages/NumericUpDownPage.axaml.cs
index d903173..ddc981f 100644
--- a/ControlCatalogStandalone/Pages/NumericUpDownPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/NumericUpDownPage.axaml.cs
@@ -13,15 +13,11 @@ namespace ControlCatalogStandalone.Pages
     {
         public NumericUpDownPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             var viewModel = new NumbersPageViewModel();
             DataContext = viewModel;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         public static IValueConverter CultureConverter =
             new FuncValueConverter<CultureInfo, NumberFormatInfo>(c => (c ?? CultureInfo.CurrentCulture).NumberFormat);
@@ -44,13 +40,13 @@ namespace ControlCatalogStandalone.Pages
         public double DoubleValue
         {
             get { return _doubleValue; }
-            set { this.RaiseAndSetIfChanged(ref _doubleValue, value); }
+            set { RaiseAndSetIfChanged(ref _doubleValue, value); }
         }
 
         public decimal DecimalValue
         {
             get { return _decimalValue; }
-            set { this.RaiseAndSetIfChanged(ref _decimalValue, value); }
+            set { RaiseAndSetIfChanged(ref _decimalValue, value); }
         }
 
         public IList<FormatObject> Formats
@@ -93,7 +89,7 @@ namespace ControlCatalogStandalone.Pages
         public FormatObject? SelectedFormat
         {
             get { return _selectedFormat; }
-            set { this.RaiseAndSetIfChanged(ref _selectedFormat, value); }
+            set { RaiseAndSetIfChanged(ref _selectedFormat, value); }
         }
     }
 
diff --git a/ControlCatalogStandalone/Pages/PlatformInfoPage.axaml.cs b/ControlCatalogStandalone/Pages/PlatformInfoPage.axaml.cs
index a97bcf9..9b67c3b 100644
--- a/ControlCatalogStandalone/Pages/PlatformInfoPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/PlatformInfoPage.axaml.cs
@@ -11,13 +11,9 @@ namespace ControlCatalogStandalone.Pages
     {
         public PlatformInfoPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new PlatformInformationViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/PointersPage.axaml.cs b/ControlCatalogStandalone/Pages/PointersPage.axaml.cs
index 91afc2e..5b5b934 100644
--- a/ControlCatalogStandalone/Pages/PointersPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/PointersPage.axaml.cs
@@ -9,7 +9,7 @@ public partial class PointersPage : UserControl
 {
     public PointersPage()
     {
-        this.InitializeComponent();
+        InitializeComponent();
 
         var border1 = this.Get<Border>("BorderCapture1");
         var border2 = this.Get<Border>("BorderCapture2");
diff --git a/ControlCatalogStandalone/Pages/ProgressBarPage.axaml.cs b/ControlCatalogStandalone/Pages/ProgressBarPage.axaml.cs
index 2f6246d..c6d53c7 100644
--- a/ControlCatalogStandalone/Pages/ProgressBarPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ProgressBarPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public ProgressBarPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/RadioButtonPage.axaml.cs b/ControlCatalogStandalone/Pages/RadioButtonPage.axaml.cs
index 4271fdc..a091be9 100644
--- a/ControlCatalogStandalone/Pages/RadioButtonPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/RadioButtonPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public RadioButtonPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ScrollViewerPage.axaml.cs b/ControlCatalogStandalone/Pages/ScrollViewerPage.axaml.cs
index cfb36ab..1a1de2f 100644
--- a/ControlCatalogStandalone/Pages/ScrollViewerPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ScrollViewerPage.axaml.cs
@@ -49,25 +49,25 @@ namespace ControlCatalogStandalone.Pages
         public bool AllowAutoHide
         {
             get => _allowAutoHide;
-            set => this.RaiseAndSetIfChanged(ref _allowAutoHide, value);
+            set => RaiseAndSetIfChanged(ref _allowAutoHide, value);
         }
 
         public bool EnableInertia
         {
             get => _enableInertia;
-            set => this.RaiseAndSetIfChanged(ref _enableInertia, value);
+            set => RaiseAndSetIfChanged(ref _enableInertia, value);
         }
 
         public ScrollBarVisibility HorizontalScrollVisibility
         {
             get => _horizontalScrollVisibility;
-            set => this.RaiseAndSetIfChanged(ref _horizontalScrollVisibility, value);
+            set => RaiseAndSetIfChanged(ref _horizontalScrollVisibility, value);
         }
 
         public ScrollBarVisibility VerticalScrollVisibility
         {
             get => _verticalScrollVisibility;
-            set => this.RaiseAndSetIfChanged(ref _verticalScrollVisibility, value);
+            set => RaiseAndSetIfChanged(ref _verticalScrollVisibility, value);
         }
 
         public List<ScrollBarVisibility> AvailableVisibility { get; }
@@ -75,19 +75,19 @@ namespace ControlCatalogStandalone.Pages
         public bool AreSnapPointsRegular
         {
             get => _areSnapPointsRegular;
-            set => this.RaiseAndSetIfChanged(ref _areSnapPointsRegular, value);
+            set => RaiseAndSetIfChanged(ref _areSnapPointsRegular, value);
         }
 
         public SnapPointsType SnapPointsType
         {
             get => _snapPointsType;
-            set => this.RaiseAndSetIfChanged(ref _snapPointsType, value);
+            set => RaiseAndSetIfChanged(ref _snapPointsType, value);
         }
 
         public SnapPointsAlignment SnapPointsAlignment
         {
             get => _snapPointsAlignment;
-            set => this.RaiseAndSetIfChanged(ref _snapPointsAlignment, value);
+            set => RaiseAndSetIfChanged(ref _snapPointsAlignment, value);
         }
         public List<SnapPointsType> AvailableSnapPointsType { get; }
         public List<SnapPointsAlignment> AvailableSnapPointsAlignment { get; }
@@ -102,9 +102,5 @@ namespace ControlCatalogStandalone.Pages
             DataContext = new ScrollViewerPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/SliderPage.axaml.cs b/ControlCatalogStandalone/Pages/SliderPage.axaml.cs
index dc22b66..b3e9f65 100644
--- a/ControlCatalogStandalone/Pages/SliderPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/SliderPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public SliderPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/SplitViewPage.axaml.cs b/ControlCatalogStandalone/Pages/SplitViewPage.axaml.cs
index b7bcb82..25a25d9 100644
--- a/ControlCatalogStandalone/Pages/SplitViewPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/SplitViewPage.axaml.cs
@@ -9,13 +9,9 @@ namespace ControlCatalogStandalone.Pages
     {
         public SplitViewPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
             DataContext = new SplitViewPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/TabControlPage.axaml.cs b/ControlCatalogStandalone/Pages/TabControlPage.axaml.cs
index 23b5220..915baf4 100644
--- a/ControlCatalogStandalone/Pages/TabControlPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TabControlPage.axaml.cs
@@ -44,10 +44,6 @@ namespace ControlCatalogStandalone.Pages
             };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
 
         private static Bitmap LoadBitmap(string uri)
         {
diff --git a/ControlCatalogStandalone/Pages/TabStripPage.axaml.cs b/ControlCatalogStandalone/Pages/TabStripPage.axaml.cs
index 056738f..c7408de 100644
--- a/ControlCatalogStandalone/Pages/TabStripPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TabStripPage.axaml.cs
@@ -31,9 +31,5 @@ namespace ControlCatalogStandalone.Pages
             };
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/TextBlockPage.axaml.cs b/ControlCatalogStandalone/Pages/TextBlockPage.axaml.cs
index 758005d..65fa49f 100644
--- a/ControlCatalogStandalone/Pages/TextBlockPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TextBlockPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public TextBlockPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/TextBoxPage.axaml.cs b/ControlCatalogStandalone/Pages/TextBoxPage.axaml.cs
index 3821b89..2dd682e 100644
--- a/ControlCatalogStandalone/Pages/TextBoxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TextBoxPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public TextBoxPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ToggleSwitchPage.axaml.cs b/ControlCatalogStandalone/Pages/ToggleSwitchPage.axaml.cs
index b2b6b21..5441aa6 100644
--- a/ControlCatalogStandalone/Pages/ToggleSwitchPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ToggleSwitchPage.axaml.cs
@@ -8,12 +8,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public ToggleSwitchPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ToolTipPage.axaml.cs b/ControlCatalogStandalone/Pages/ToolTipPage.axaml.cs
index 6130012..c94d2f8 100644
--- a/ControlCatalogStandalone/Pages/ToolTipPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ToolTipPage.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public ToolTipPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/TransitioningContentControlPage.axaml.cs b/ControlCatalogStandalone/Pages/TransitioningContentControlPage.axaml.cs
index e039c77..eee013b 100644
--- a/ControlCatalogStandalone/Pages/TransitioningContentControlPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TransitioningContentControlPage.axaml.cs
@@ -11,9 +11,5 @@ namespace ControlCatalogStandalone.Pages
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/TreeViewPage.axaml.cs b/ControlCatalogStandalone/Pages/TreeViewPage.axaml.cs
index a440066..c2f0a8f 100644
--- a/ControlCatalogStandalone/Pages/TreeViewPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/TreeViewPage.axaml.cs
@@ -12,9 +12,5 @@ namespace ControlCatalogStandalone.Pages
             DataContext = new TreeViewPageViewModel();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/ViewboxPage.axaml.cs b/ControlCatalogStandalone/Pages/ViewboxPage.axaml.cs
index 384996d..f272add 100644
--- a/ControlCatalogStandalone/Pages/ViewboxPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/ViewboxPage.axaml.cs
@@ -10,9 +10,5 @@ namespace ControlCatalogStandalone.Pages
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/Pages/WindowCustomizationsPage.axaml.cs b/ControlCatalogStandalone/Pages/WindowCustomizationsPage.axaml.cs
index fd3c2ca..4e9d0f4 100644
--- a/ControlCatalogStandalone/Pages/WindowCustomizationsPage.axaml.cs
+++ b/ControlCatalogStandalone/Pages/WindowCustomizationsPage.axaml.cs
@@ -8,12 +8,8 @@ namespace ControlCatalogStandalone.Pages
     {
         public WindowCustomizationsPage()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/ControlCatalogStandalone/ViewModels/MainWindowViewModel.cs b/ControlCatalogStandalone/ViewModels/MainWindowViewModel.cs
index fbe66c0..413bea1 100644
--- a/ControlCatalogStandalone/ViewModels/MainWindowViewModel.cs
+++ b/ControlCatalogStandalone/ViewModels/MainWindowViewModel.cs
@@ -36,7 +36,7 @@ namespace ControlCatalogStandalone.ViewModels
             {
                 var dialog = new AboutAvaloniaDialog();
 
-                if ((App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow is
+                if ((Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow is
                     { } mainWindow)
                 {
                     await dialog.ShowDialog(mainWindow);
@@ -44,7 +44,7 @@ namespace ControlCatalogStandalone.ViewModels
             });
             ExitCommand = MiniCommand.Create(() =>
             {
-                (App.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
+                (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
             });
 
             ToggleMenuItemCheckedCommand = MiniCommand.Create(() => { IsMenuItemChecked = !IsMenuItemChecked; });
diff --git a/ControlCatalogStandalone/ViewModels/NotificationViewModel.cs b/ControlCatalogStandalone/ViewModels/NotificationViewModel.cs
index 459ecab..4e6b5e6 100644
--- a/ControlCatalogStandalone/ViewModels/NotificationViewModel.cs
+++ b/ControlCatalogStandalone/ViewModels/NotificationViewModel.cs
@@ -16,22 +16,22 @@ namespace ControlCatalogStandalone.ViewModels
 
             ShowManagedNotificationCommand = MiniCommand.Create(() =>
             {
-                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
+                NotificationManager?.Show(new Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
             });
 
             ShowNativeNotificationCommand = MiniCommand.Create(() =>
             {
-                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
+                NotificationManager?.Show(new Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
             });
 
             YesCommand = MiniCommand.Create(() =>
             {
-                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
+                NotificationManager?.Show(new Notification("Avalonia Notifications", "Start adding notifications to your app today."));
             });
 
             NoCommand = MiniCommand.Create(() =>
             {
-                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
+                NotificationManager?.Show(new Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
             });
         }
 
diff --git a/ControlCatalogStandalone/Views/CustomNotificationView.axaml.cs b/ControlCatalogStandalone/Views/CustomNotificationView.axaml.cs
index ebd5989..e92db00 100644
--- a/ControlCatalogStandalone/Views/CustomNotificationView.axaml.cs
+++ b/ControlCatalogStandalone/Views/CustomNotificationView.axaml.cs
@@ -7,12 +7,8 @@ namespace ControlCatalogStandalone.Views
     {
         public CustomNotificationView()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }