diff --git a/Avalonia.EliteBGS/MainWindow.axaml b/Avalonia.EliteBGS/MainWindow.axaml
index 7e55e7c..6e3960d 100644
--- a/Avalonia.EliteBGS/MainWindow.axaml
+++ b/Avalonia.EliteBGS/MainWindow.axaml
@@ -1,5 +1,4 @@
-<mah:MetroWindow
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Window
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -171,9 +170,9 @@
                         <Button x:Name="ParseJournal" Content="Parse Journal" VerticalAlignment="Center" Click="ParseJournal_Click" HorizontalAlignment="Center"/>
                         <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
                         <Label Content="From (UTC):" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center"/>
-                        <mah:DateTimePicker x:Name="startdate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <DatePicker x:Name="startdate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <Label Content="To (UTC):" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                        <mah:DateTimePicker x:Name="enddate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        <DatePicker x:Name="enddate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
                         <Button x:Name="ResetTime" Content="Reset Time" Click="ResetTime_Click" />
                         <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
@@ -189,7 +188,7 @@
                         <Label Content="Post log as" VerticalAlignment="Center" Margin="0,3,0,3" />
                         <ComboBox x:Name="Commanders" VerticalAlignment="Stretch" Margin="0,3,0,3" Width="180" />
                         <Label Content="to" VerticalAlignment="Center" Margin="0,3,0,3" />
-                        <mah:DropDownButton x:Name="PostToDiscord" Content="Discord" />
+                        <ComboBox x:Name="PostToDiscord" Content="Discord" />
                     </ToolBar>
                     <TreeView CheckBox.Checked="TreeView_CheckBox_Updated"
                               CheckBox.Unchecked="TreeView_CheckBox_Updated"
@@ -268,9 +267,9 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <mah:ToggleSwitch x:Name="NoInfluenceSupport" Grid.Row="0" Grid.ColumnSpan="2" Content="Ignore secondary influence support given out by certain missions" Toggled="NoInfluenceSupport_Toggled"/>
-                            <mah:ToggleSwitch x:Name="NoMarketBuy" Grid.Row="1" Grid.ColumnSpan="2" Content="Ignore commodities bought at stations" Toggled="NoMarketBuy_Toggled"/>
-                            <mah:ToggleSwitch x:Name="NoFleetCarrier" Grid.Row="2" Grid.ColumnSpan="2" Content="Ignore transactions done on a Fleet Carrier" Toggled="NoFleetCarrier_Toggled" />
+                            <ToggleButton x:Name="NoInfluenceSupport" Grid.Row="0" Grid.ColumnSpan="2" Content="Ignore secondary influence support given out by certain missions" Toggled="NoInfluenceSupport_Toggled"/>
+                            <ToggleButton x:Name="NoMarketBuy" Grid.Row="1" Grid.ColumnSpan="2" Content="Ignore commodities bought at stations" Toggled="NoMarketBuy_Toggled"/>
+                            <ToggleButton x:Name="NoFleetCarrier" Grid.Row="2" Grid.ColumnSpan="2" Content="Ignore transactions done on a Fleet Carrier" Toggled="NoFleetCarrier_Toggled" />
                         </Grid>
                     </GroupBox>
                     <GroupBox Header="Discord Webhooks" Grid.Row="3" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="3" Margin="0,5,0,0">
@@ -328,4 +327,4 @@
             </TabItem>
         </TabControl>
     </Grid>
-</mah:MetroWindow>
+</Window>
diff --git a/Avalonia.EliteBGS/MainWindow.axaml.cs b/Avalonia.EliteBGS/MainWindow.axaml.cs
index d5fc807..ec83169 100644
--- a/Avalonia.EliteBGS/MainWindow.axaml.cs
+++ b/Avalonia.EliteBGS/MainWindow.axaml.cs
@@ -9,6 +9,7 @@ using EliteBGS.BGS;
 using EliteBGS.Util;
 using System.Globalization;
 using System.Diagnostics;
+using Avalonia;
 using Avalonia.Controls;
 
 namespace EliteBGS;
@@ -16,7 +17,7 @@ namespace EliteBGS;
 /// <summary>
 /// Interaction logic for MainWindow.xaml
 /// </summary>
-public partial class MainWindow : MetroWindow {
+public partial class MainWindow : Window {
     private PlayerJournal journal;
     private Report report;