diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..cbd8415
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "xamlstyler.console": {
+      "version": "3.2001.0",
+      "commands": [
+        "xstyler"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/App.xaml b/DiscordChatExporter.Gui/App.xaml
index 1fc29c8..d22bbc8 100644
--- a/DiscordChatExporter.Gui/App.xaml
+++ b/DiscordChatExporter.Gui/App.xaml
@@ -1,4 +1,4 @@
-<Application
+<Application
     x:Class="DiscordChatExporter.Gui.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
index 7a30318..fa03955 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -30,4 +30,9 @@
     <ProjectReference Include="..\DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj" />
   </ItemGroup>
 
+  <Target Name="Format XAML" AfterTargets="BeforeBuild">
+    <Exec Command="dotnet tool restore" />
+    <Exec Command="dotnet xstyler -r -d &quot;$(MSBuildProjectDirectory)&quot;" />
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
index 03d5d02..1bd110f 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
@@ -28,8 +28,8 @@
 
         <!--  Auto-updates  -->
         <DockPanel
-            LastChildFill="False"
             Background="Transparent"
+            LastChildFill="False"
             ToolTip="Perform automatic updates on every launch">
             <TextBlock
                 Margin="16,8"
@@ -43,8 +43,8 @@
 
         <!--  Persist token  -->
         <DockPanel
-            LastChildFill="False"
             Background="Transparent"
+            LastChildFill="False"
             ToolTip="Persist last used token between sessions">
             <TextBlock
                 Margin="16,8"
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
new file mode 100644
index 0000000..e3b70d2
--- /dev/null
+++ b/Settings.XamlStyler
@@ -0,0 +1,3 @@
+{
+  "indentSize": 4
+}
\ No newline at end of file