diff --git a/DiscordChatExporter.Gui/App.axaml b/DiscordChatExporter.Gui/App.axaml
index fc1c25bc..4dffd350 100644
--- a/DiscordChatExporter.Gui/App.axaml
+++ b/DiscordChatExporter.Gui/App.axaml
@@ -1,160 +1,165 @@
-
-
-
+ x:Class="DiscordChatExporter.Gui.App"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:dialogHostAvalonia="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+ xmlns:framework="clr-namespace:DiscordChatExporter.Gui.Framework"
+ xmlns:materialAssists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+ xmlns:materialControls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
+ xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+ xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
+ Name="DiscordChatExporter"
+ ActualThemeVariantChanged="Application_OnActualThemeVariantChanged"
+>
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
index cd3ea111..8ed1479b 100644
--- a/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
+++ b/DiscordChatExporter.Gui/Views/Components/DashboardView.axaml
@@ -1,307 +1,323 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ x:Class="DiscordChatExporter.Gui.Views.Components.DashboardView"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+ xmlns:components="clr-namespace:DiscordChatExporter.Gui.ViewModels.Components"
+ xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
+ xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+ xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
+ x:Name="UserControl"
+ x:DataType="components:DashboardViewModel"
+ Loaded="UserControl_OnLoaded"
+>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ Margin="0,0,4,0"
+ Classes.voice="{Binding Channel.IsVoice}"
+ IsVisible="{Binding !Channel.IsCategory}"
+ >
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Width="18"
+ Height="18"
+ Foreground="{DynamicResource PrimaryHueMidBrush}"
+ Kind="Account"
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/Controls/HyperLink.axaml b/DiscordChatExporter.Gui/Views/Controls/HyperLink.axaml
index 454d8161..0faebd15 100644
--- a/DiscordChatExporter.Gui/Views/Controls/HyperLink.axaml
+++ b/DiscordChatExporter.Gui/Views/Controls/HyperLink.axaml
@@ -1,20 +1,22 @@
-
-
-
-
-
-
-
\ No newline at end of file
+ x:Class="DiscordChatExporter.Gui.Views.Controls.HyperLink"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"
+>
+
+
+
+
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
index b7f2e1bb..12c1f79c 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml
@@ -1,285 +1,308 @@
-
-
-
-
-
-
-
-
-
+ x:Class="DiscordChatExporter.Gui.Views.Dialogs.ExportSetupView"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+ xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
+ xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
+ xmlns:materialAssists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+ xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+ xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils"
+ x:Name="UserControl"
+ Width="380"
+ x:DataType="dialogs:ExportSetupViewModel"
+>
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
index 5e144b90..6adfc5d7 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml
@@ -1,72 +1,73 @@
-
-
+ x:Class="DiscordChatExporter.Gui.Views.Dialogs.MessageBoxView"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
+ xmlns:system="clr-namespace:System;assembly=System.Runtime"
+ Width="500"
+ x:DataType="dialogs:MessageBoxViewModel"
+>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
index c5f254e3..a6bee2f0 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml
@@ -1,148 +1,187 @@
-
-
+ x:Class="DiscordChatExporter.Gui.Views.Dialogs.SettingsView"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
+ xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
+ Width="380"
+ x:DataType="dialogs:SettingsViewModel"
+>
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/DiscordChatExporter.Gui/Views/MainView.axaml b/DiscordChatExporter.Gui/Views/MainView.axaml
index 28005ed2..8646d7a2 100644
--- a/DiscordChatExporter.Gui/Views/MainView.axaml
+++ b/DiscordChatExporter.Gui/Views/MainView.axaml
@@ -1,22 +1,23 @@
-
-
-
-
-
+ x:Class="DiscordChatExporter.Gui.Views.MainView"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:dialogHostAvalonia="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+ xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
+ xmlns:viewModels="clr-namespace:DiscordChatExporter.Gui.ViewModels"
+ Title="{Binding Title}"
+ Width="625"
+ Height="665"
+ MinWidth="600"
+ MinHeight="400"
+ x:DataType="viewModels:MainViewModel"
+ Icon="/favicon.ico"
+ RenderOptions.BitmapInterpolationMode="HighQuality"
+ WindowStartupLocation="CenterScreen"
+>
+
+
+
+
+