diff --git a/Avalonia.EliteBGS/App.axaml.cs b/Avalonia.EliteBGS/App.axaml.cs
index f768446..591a964 100644
--- a/Avalonia.EliteBGS/App.axaml.cs
+++ b/Avalonia.EliteBGS/App.axaml.cs
@@ -6,5 +6,7 @@ namespace EliteBGS {
     /// </summary>
     public partial class EliteBGSApplication : Application
     {
+        public static void Main(string[] args) {
+        }
     }
 }
diff --git a/Avalonia.EliteBGS/EliteBGS.csproj b/Avalonia.EliteBGS/EliteBGS.csproj
index 026a1b8..e44e225 100644
--- a/Avalonia.EliteBGS/EliteBGS.csproj
+++ b/Avalonia.EliteBGS/EliteBGS.csproj
@@ -6,7 +6,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>EliteBGSApplication</StartupObject>
+    <StartupObject>EliteBGS.EliteBGSApplication</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Salus.ico</ApplicationIcon>
diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml b/Avalonia.EliteBGS/LoadEntriesWindow.axaml
index 1f91911..57792e7 100644
--- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml
+++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml
@@ -1,5 +1,5 @@
 <Window x:Class="EliteBGS.LoadEntriesWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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"
diff --git a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
index c7017f8..899b6af 100644
--- a/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
+++ b/Avalonia.EliteBGS/LoadEntriesWindow.axaml.cs
@@ -47,8 +47,7 @@ public partial class LoadEntriesWindow : Window {
                 EntriesLoaded?.Invoke(entries);
             }
         } catch (Exception exception) {
-            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
-                exception.ToString()));
+            // TODO: MessageBox
         }
     }
 
@@ -57,29 +56,7 @@ public partial class LoadEntriesWindow : Window {
     }
 
     private void LoadFile_Click(object sender, RoutedEventArgs e) {
-        OpenFileDialog dialog = new OpenFileDialog();
-
-        dialog.DefaultExt = ".log";
-        dialog.Filter = "Log files (*.log)|*.log|All files (*.*)|*";
-
-        var location = AppConfig.DefaultJournalLocation;
-        if (Directory.Exists(location)) {
-            dialog.InitialDirectory = location;
-        }
-
-        bool result = dialog.ShowDialog(this) ?? false;
-        if (!result) {
-            return;
-        }
-
-        try {
-            using (FileStream stream = File.OpenRead(dialog.FileName)) {
-                using (StreamReader reader = new StreamReader(stream)) {
-                    Lines.Text = reader.ReadToEnd();
-                }
-            }
-        } catch (Exception) {
-        }
+        // TODO: OpenFileDialog
     }
 
     private void DeleteUnimportant_Click(object sender, RoutedEventArgs e) {
@@ -113,8 +90,7 @@ public partial class LoadEntriesWindow : Window {
                 ;
             Lines.Text = string.Join("\n", text).Trim();
         } catch (Exception exception) {
-            MessageBox.Show(string.Format("There was an error while parsing the JSON: {0}",
-                exception.ToString()));
+            // TODO: MessageBox
         }
     }
 }
diff --git a/Avalonia.EliteBGS/MainWindow.axaml b/Avalonia.EliteBGS/MainWindow.axaml
index 6e3960d..4ea15ff 100644
--- a/Avalonia.EliteBGS/MainWindow.axaml
+++ b/Avalonia.EliteBGS/MainWindow.axaml
@@ -131,19 +131,6 @@
         </DataTemplate>
 
     </Window.Resources>
-    <!--
-    <mah:MetroWindow.RightWindowCommands>
-        <mah:WindowCommands ShowSeparators="False">
-            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,5,0">
-                <Hyperlink x:Name="URL" NavigateUri="https://salusinvicta.org/bgstool/" RequestNavigate="URL_RequestNavigate">Homepage</Hyperlink>
-            </TextBlock>
-            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5,0,15,0">
-                <Hyperlink x:Name="SRC" NavigateUri="https://codeberg.org/nola/EDBGS" RequestNavigate="URL_RequestNavigate">Source</Hyperlink>
-            </TextBlock>
-            <mah:ToggleSwitch Content="Dark Theme" x:Name="SwitchTheme" IsOn="True" Toggled="SwitchTheme_Toggled"/>
-        </mah:WindowCommands>
-    </mah:MetroWindow.RightWindowCommands>
-    -->
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
@@ -174,8 +161,6 @@
                         <Label Content="To (UTC):" 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"/>
                         <Button x:Name="ManuallyParse" Content="Manually Parse" Click="ManuallyParse_Click" />
                     </ToolBar>
                     <ToolBar Grid.Row="1" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="3">
@@ -313,16 +298,7 @@
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <TextBox IsReadOnly="True" Grid.Row="1" x:Name="log" Height="Auto" Margin="5" TextWrapping="Wrap" FontFamily="Courier New" />
-                    <RichTextBox IsReadOnly="True" HorizontalAlignment="Left" Height="Auto" Margin="5" Width="Auto" VerticalContentAlignment="Stretch" VerticalAlignment="Top" BorderBrush="{x:Null}" SelectionBrush="{x:Null}">
-                        <FlowDocument>
-                            <Paragraph>
-                                <Run Text="This tool does not recognise every option and/or configuration that E:D outputs through its JSON files."/>
-                            </Paragraph>
-                            <Paragraph>
-                                <Run Text="Within this log you will find error messages that are of interest to the author (CMDR Hekateh). If something appears here please send it to me via Discord."/>
-                            </Paragraph>
-                        </FlowDocument>
-                    </RichTextBox>
+                    <TextBox IsReadOnly="True" HorizontalAlignment="Left" Height="Auto" Margin="5" Width="Auto" VerticalContentAlignment="Stretch" VerticalAlignment="Top" Content="This tool does not recognise every option and/or configuration that E:D outputs through its JSON files.\nWithin this log you will find error messages that are of interest to the author (CMDR Hekateh). If something appears here please send it to me via Discord." />
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/Avalonia.EliteBGS/MainWindow.axaml.cs b/Avalonia.EliteBGS/MainWindow.axaml.cs
index 5dbad89..37d53d1 100644
--- a/Avalonia.EliteBGS/MainWindow.axaml.cs
+++ b/Avalonia.EliteBGS/MainWindow.axaml.cs
@@ -11,6 +11,7 @@ using System.Globalization;
 using System.Diagnostics;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Input;
 
@@ -57,98 +58,22 @@ public partial class MainWindow : Window {
             LogType.SelectedIndex = 0;
         }
 
-        this.NoInfluenceSupport.IsOn = Config.Global.IgnoreInfluenceSupport;
-        this.NoMarketBuy.IsOn = Config.Global.IgnoreMarketBuy;
-        this.NoFleetCarrier.IsOn = Config.Global.IgnoreFleetCarrier;
-
-        // Apply theme
-        try {
-            AddCustomThemes();
-
-            string[] colours = ThemeManager.Current.Themes
-                .Select(x => x.ColorScheme)
-                .DistinctBy(x => x)
-                .OrderBy(x => x)
-                .ToArray()
-                ;
-
-            foreach (var colour in colours) {
-                Colour.Items.Add(colour);
-                if (!string.IsNullOrEmpty(Config.Global.Colour) &&
-                    string.Compare(colour, Config.Global.Colour, true) == 0) {
-                    Colour.SelectedIndex = Colour.Items.Count - 1;
-                }
-            }
-
-            if (Colour.SelectedIndex < 0) {
-                Colour.SelectedIndex = 0;
-            }
-
-            SwitchTheme.IsOn = (string.Compare(Config.Global.Theme, "dark", true) == 0);
-
-            ThemeManager.Current.ChangeTheme(this, Config.Global.FullTheme);
-        } catch (Exception) {
-            // Theme is invalid, revert back to our standard dark theme
-            Config.Global.Colour = "Amber";
-            Config.Global.Theme = "Dark";
-        }
+        this.NoInfluenceSupport.IsChecked = Config.Global.IgnoreInfluenceSupport;
+        this.NoMarketBuy.IsChecked = Config.Global.IgnoreMarketBuy;
+        this.NoFleetCarrier.IsChecked = Config.Global.IgnoreFleetCarrier;
 
+        InitialiseTime();
         journal = new PlayerJournal(Config.Global.JournalLocation);
 
-        // Set both to now
-        InitialiseTime();
-
         journallocation.Text = Config.Global.JournalLocation;
     }
 
-    private void AddCustomThemes() {
-        Dictionary<string, Color> colorThemes = new() {
-            //{ "HouseSalus", Color.FromRgb(0xBC, 0x94, 0x39) },
-            { "HouseSalus", Color.FromRgb(0xED, 0xDA, 0x70) },
-            { "NovaNavy", Color.FromRgb(0xA1, 0xA4, 0xDB) },
-            // Official Red of the Polish Flag
-            { "PolskaGurom", Color.FromRgb(0xD4, 0x21, 0x3D) },
-            // Official Blue in the Armenian Flag
-            { "ArmeniaBlue", Color.FromRgb(0x00, 0x33, 0xA0) },
-        };
-
-        foreach (var colourtheme in colorThemes) {
-            var brush = new SolidColorBrush(colourtheme.Value);
-
-            // Add light theme
-            ThemeManager.Current.AddTheme(new Theme(
-                "Light." + colourtheme.Key,
-                "Light." + colourtheme.Key,
-                "Light",
-                colourtheme.Key,
-                colourtheme.Value,
-                brush,
-                true,
-                false)
-                );
-            // Add dark theme
-            ThemeManager.Current.AddTheme(new Theme(
-                "Dark." + colourtheme.Key,
-                "Dark." + colourtheme.Key,
-                "Dark",
-                colourtheme.Key,
-                colourtheme.Value,
-                brush,
-                true,
-                false)
-                );
-        }
-    }
-
     private void InitialiseTime() {
         DateTime today = DateTime.Today;
         DateTime tomorrow = today.AddDays(1);
 
-        // HOCHKULTUR
-        startdate.Culture = enddate.Culture = CultureInfo.GetCultureInfo("de-AT");
-
-        startdate.SelectedDateTime = today;
-        enddate.SelectedDateTime = tomorrow;
+        startdate.SelectedDate = today;
+        enddate.SelectedDate = tomorrow;
     }
 
     private void TreeView_CheckBox_Updated(object sender, RoutedEventArgs args) {
@@ -163,7 +88,7 @@ public partial class MainWindow : Window {
         builder.Append(message);
         builder.Append("\n");
 
-        log.AppendText(builder.ToString());
+        log.Text = log.Text + builder.ToString();
     }
 
     private void Log(string message) {
@@ -209,7 +134,9 @@ public partial class MainWindow : Window {
     }
 
     private void HandleEntries(List<Entry> entries) {
-        HandleEntries(entries, startdate.SelectedDateTime ?? DateTime.Now, enddate.SelectedDateTime ?? DateTime.Now);
+        HandleEntries(entries,
+                      startdate.SelectedDate?.Date ?? DateTime.Now,
+                      enddate.SelectedDate?.Date ?? DateTime.Now);
     }
 
     private void Loadentries_EntriesLoaded(List<Entry> lines) {
@@ -220,8 +147,8 @@ public partial class MainWindow : Window {
         try {
             TransactionParser parser = new TransactionParser();
 
-            DateTime start = startdate.SelectedDateTime ?? DateTime.Now;
-            DateTime end = enddate.SelectedDateTime ?? DateTime.Now;
+            DateTime start = startdate.SelectedDate?.Date ?? DateTime.Now;
+            DateTime end = enddate.SelectedDate?.Date ?? DateTime.Now;
 
             journal.Open(); // Load all files
             // Log files only get rotated if you restart the game client. This means that there might
@@ -314,15 +241,11 @@ public partial class MainWindow : Window {
     }
 
     private void browsejournallocation_Click(object sender, RoutedEventArgs e) {
-        var dialog = new VistaFolderBrowserDialog();
+        // TODO: dialog
 
-        if ((bool)!dialog.ShowDialog()) {
-            return;
-        }
-
-        Config.Global.JournalLocation = dialog.SelectedPath;
-        journallocation.Text = Config.Global.JournalLocation;
-        journal = new PlayerJournal(Config.Global.JournalLocation);
+        //Config.Global.JournalLocation = dialog.SelectedPath;
+        //journallocation.Text = Config.Global.JournalLocation;
+        //journal = new PlayerJournal(Config.Global.JournalLocation);
     }
 
     private Objective GetObjectiveFromControl(object sender) {
@@ -354,7 +277,6 @@ public partial class MainWindow : Window {
     }
 
     private void RefreshView() {
-        entries.Items.Refresh();
         GenerateLog();
     }
 
@@ -391,7 +313,7 @@ public partial class MainWindow : Window {
         try {
             Config.SaveGlobal();
         } catch (Exception error) {
-            MessageBox.Show("There was an error saving your settings: " + error.Message);
+            //TODO: MessageBox
         }
     }
 
@@ -492,28 +414,6 @@ public partial class MainWindow : Window {
         }
     }
 
-    private DateTime ResetTimeToZero(DateTime d) {
-        DateTime obj = d;
-
-        obj = obj.AddHours(d.Hour * -1);
-        obj = obj.AddMinutes(d.Minute * -1);
-        obj = obj.AddSeconds(d.Second * -1);
-
-        return obj;
-    }
-
-    private void ResetTime_Click(object sender, RoutedEventArgs e) {
-        DateTime? d = startdate.SelectedDateTime;
-        if (d != null) {
-            startdate.SelectedDateTime = ResetTimeToZero(d.Value);
-        }
-
-        d = enddate.SelectedDateTime;
-        if (d != null) {
-            enddate.SelectedDateTime = ResetTimeToZero(d.Value);
-        }
-    }
-
     private void ToggleAll_Click(object sender, RoutedEventArgs e) {
         ToggleButton button = sender as ToggleButton;
         Objective objective = GetObjectiveFromControl(sender);
@@ -526,49 +426,16 @@ public partial class MainWindow : Window {
             ;
     }
 
-    private void UpdateTheme() {
-        ThemeManager.Current.ChangeTheme(this, Config.Global.FullTheme);
-    }
-
-    private void SwitchTheme_Toggled(object sender, RoutedEventArgs e) {
-        ToggleSwitch toggle = sender as ToggleSwitch;
-        if (toggle.IsOn) {
-            Config.Global.Theme = "Dark";
-        } else {
-            Config.Global.Theme = "Light";
-        }
-        UpdateTheme();
-    }
-
-    private void Colour_SelectionChanged(object sender, SelectionChangedEventArgs e) {
-        if (Colour.SelectedItem == null) {
-            return;
-        }
-
-        Config.Global.Colour = Colour.SelectedItem.ToString();
-        UpdateTheme();
-    }
-
-    /*
-    private void URL_RequestNavigate(object sender, RequestNavigateEventArgs e) {
-        ProcessStartInfo info = new ProcessStartInfo();
-        info.UseShellExecute = true;
-        info.FileName = e.Uri.AbsoluteUri;
-        Process.Start(info);
-        e.Handled = true;
-    }
-    */
-
     private void NoInfluenceSupport_Toggled(object sender, RoutedEventArgs e) {
-        Config.Global.IgnoreInfluenceSupport = this.NoInfluenceSupport.IsOn;
+        Config.Global.IgnoreInfluenceSupport = (bool)this.NoInfluenceSupport.IsChecked;
     }
 
     private void NoMarketBuy_Toggled(object sender, RoutedEventArgs e) {
-        Config.Global.IgnoreMarketBuy = this.NoMarketBuy.IsOn;
+        Config.Global.IgnoreMarketBuy = (bool)this.NoMarketBuy.IsChecked;
     }
 
     private void NoFleetCarrier_Toggled(object sender, RoutedEventArgs e) {
-        Config.Global.IgnoreFleetCarrier = this.NoFleetCarrier.IsOn;
+        Config.Global.IgnoreFleetCarrier = (bool)this.NoFleetCarrier.IsChecked;
     }
 
     private void OpenInExplorer_Click(object sender, RoutedEventArgs e) {
@@ -592,7 +459,6 @@ public partial class MainWindow : Window {
             Name = "Discord Server Name",
             Webhook = "..."
         });
-        Webhooks.Items.Refresh();
         RefreshPostMenu();
     }
 
@@ -608,17 +474,16 @@ public partial class MainWindow : Window {
         foreach (var item in selection) {
             Config.Global.Webhooks.Remove(item);
         }
-        Webhooks.Items.Refresh();
         RefreshPostMenu();
     }
 
     private void Webhooks_KeyUp(object sender, KeyEventArgs e) {
-        DataGridCell cell = e.OriginalSource as DataGridCell;
+        DataGridCell cell = e.Source as DataGridCell;
         /* We also get keypresses from DataGridCells that are currently
          * editing their content. Filter those out. We don't want to delete
          * the row when the user presses DEL while editing the cells content
          */
-        if (cell == null || cell.IsEditing) {
+        if (cell == null) {
             return;
         }
         if (e.Key == Key.Delete) {
@@ -667,12 +532,7 @@ public partial class MainWindow : Window {
         try {
             chunks = discord.SplitLog(DiscordLog.Text);
         } catch (Exception) {
-            MessageBox.Show(
-                "The log could not be split into discord appropriate length.\n" +
-                "This happens with the bigger logs formats if you do lots of things in one system.\n" +
-                "Try posting the log in the OneLine format.",
-                "Sorry!", MessageBoxButton.OK, MessageBoxImage.Error
-                );
+            //TODO: Messagebox
             return;
         }