diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea2bfab8..5d626e2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed model index startup errors when `./Models` contains unknown custom folder names
 - Fixed ストップ button being cut off in Japanese translation 
 - Fixed update progress freezing in some cases
+- Fixed light theme being default in first time setup window
 
 ## v2.4.6
 ### Added
diff --git a/StabilityMatrix.Avalonia/App.axaml b/StabilityMatrix.Avalonia/App.axaml
index 76cfbbf8..0258b36b 100644
--- a/StabilityMatrix.Avalonia/App.axaml
+++ b/StabilityMatrix.Avalonia/App.axaml
@@ -4,7 +4,7 @@
              xmlns:local="using:StabilityMatrix.Avalonia"
              xmlns:idcr="using:Dock.Avalonia.Controls.Recycling"
              xmlns:styling="clr-namespace:FluentAvalonia.Styling;assembly=FluentAvalonia"
-             RequestedThemeVariant="Default">
+             RequestedThemeVariant="Dark">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.DataTemplates>
diff --git a/StabilityMatrix.Avalonia/Views/FirstLaunchSetupWindow.axaml.cs b/StabilityMatrix.Avalonia/Views/FirstLaunchSetupWindow.axaml.cs
index 3bcf1ef4..f02ea254 100644
--- a/StabilityMatrix.Avalonia/Views/FirstLaunchSetupWindow.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/FirstLaunchSetupWindow.axaml.cs
@@ -1,4 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using FluentAvalonia.UI.Controls;
@@ -9,7 +11,7 @@ namespace StabilityMatrix.Avalonia.Views;
 public partial class FirstLaunchSetupWindow : AppWindowBase
 {
     public ContentDialogResult Result { get; private set; }
-    
+
     public FirstLaunchSetupWindow()
     {
         InitializeComponent();
@@ -19,14 +21,14 @@ public partial class FirstLaunchSetupWindow : AppWindowBase
     {
         AvaloniaXamlLoader.Load(this);
     }
-    
+
     [SuppressMessage("ReSharper", "UnusedParameter.Local")]
     private void ContinueButton_OnClick(object? sender, RoutedEventArgs e)
     {
         Result = ContentDialogResult.Primary;
         Close();
     }
-    
+
     [SuppressMessage("ReSharper", "UnusedParameter.Local")]
     private void QuitButton_OnClick(object? sender, RoutedEventArgs e)
     {