From a194bf937e2eea29011df6b2322f00c40e9617a4 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Tue, 11 Jun 2024 20:28:43 +0100
Subject: [PATCH] Finalize/rearrange new progress dialog naming

---
 Bloxstrap/Enums/BootstrapperStyle.cs          |   6 +-
 Bloxstrap/Extensions/BootstrapperStyleEx.cs   |   5 +-
 Bloxstrap/Resources/Strings.Designer.cs       |  45 ++++---
 Bloxstrap/Resources/Strings.resx              |  15 ++-
 .../Bootstrapper/ClassicFluentDialog.xaml     |  47 +++++++
 ...og.xaml.cs => ClassicFluentDialog.xaml.cs} |  38 ++----
 .../Elements/Bootstrapper/FluentDialog.xaml   | 121 +++++++++++-------
 .../Bootstrapper/FluentDialog.xaml.cs         |  34 +++--
 .../Bootstrapper/ProgressFluentDialog.xaml    |  80 ------------
 Bloxstrap/UI/Frontend.cs                      |   8 +-
 .../ClassicFluentDialogViewModel.cs           |  15 +++
 .../Bootstrapper/FluentDialogViewModel.cs     |  25 +++-
 .../ProgressFluentDialogViewModel.cs          |  32 -----
 13 files changed, 242 insertions(+), 229 deletions(-)
 create mode 100644 Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml
 rename Bloxstrap/UI/Elements/Bootstrapper/{ProgressFluentDialog.xaml.cs => ClassicFluentDialog.xaml.cs} (77%)
 delete mode 100644 Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml
 create mode 100644 Bloxstrap/UI/ViewModels/Bootstrapper/ClassicFluentDialogViewModel.cs
 delete mode 100644 Bloxstrap/UI/ViewModels/Bootstrapper/ProgressFluentDialogViewModel.cs

diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs
index 118f3d2..2dff225 100644
--- a/Bloxstrap/Enums/BootstrapperStyle.cs
+++ b/Bloxstrap/Enums/BootstrapperStyle.cs
@@ -6,9 +6,9 @@
         LegacyDialog2008,
         LegacyDialog2011,
         ProgressDialog,
-        FluentDialog,
+        ClassicFluentDialog,
         ByfronDialog,
-        ProgressFluentDialog,
-        ProgressFluentAeroDialog
+        FluentDialog,
+        FluentAeroDialog
     }
 }
diff --git a/Bloxstrap/Extensions/BootstrapperStyleEx.cs b/Bloxstrap/Extensions/BootstrapperStyleEx.cs
index 0681e54..3802264 100644
--- a/Bloxstrap/Extensions/BootstrapperStyleEx.cs
+++ b/Bloxstrap/Extensions/BootstrapperStyleEx.cs
@@ -7,9 +7,10 @@
         public static IReadOnlyCollection<BootstrapperStyle> Selections => new BootstrapperStyle[]
         {
             BootstrapperStyle.FluentDialog,
-            BootstrapperStyle.ProgressFluentDialog,
-            BootstrapperStyle.ProgressFluentAeroDialog,
+            BootstrapperStyle.FluentAeroDialog,
+            BootstrapperStyle.ClassicFluentDialog,
             BootstrapperStyle.ByfronDialog,
+            BootstrapperStyle.ProgressDialog,
             BootstrapperStyle.LegacyDialog2011,
             BootstrapperStyle.LegacyDialog2008,
             BootstrapperStyle.VistaDialog
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index 9e7df7f..fe388b8 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -803,6 +803,33 @@ namespace Bloxstrap.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Fluent (Classic).
+        /// </summary>
+        public static string Enums_BootstrapperStyle_ClassicFluentDialog {
+            get {
+                return ResourceManager.GetString("Enums.BootstrapperStyle.ClassicFluentDialog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fluent (Aero).
+        /// </summary>
+        public static string Enums_BootstrapperStyle_FluentAeroDialog {
+            get {
+                return ResourceManager.GetString("Enums.BootstrapperStyle.FluentAeroDialog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fluent (Classic).
+        /// </summary>
+        public static string Enums_BootstrapperStyle_FluentClassicDialog {
+            get {
+                return ResourceManager.GetString("Enums.BootstrapperStyle.FluentClassicDialog", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Fluent.
         /// </summary>
@@ -839,24 +866,6 @@ namespace Bloxstrap.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Fluent Progress (Aero).
-        /// </summary>
-        public static string Enums_BootstrapperStyle_ProgressFluentAeroDialog {
-            get {
-                return ResourceManager.GetString("Enums.BootstrapperStyle.ProgressFluentAeroDialog", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Fluent Progress.
-        /// </summary>
-        public static string Enums_BootstrapperStyle_ProgressFluentDialog {
-            get {
-                return ResourceManager.GetString("Enums.BootstrapperStyle.ProgressFluentDialog", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Vista (2008 - 2011).
         /// </summary>
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index 6604f62..15ea441 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -370,6 +370,15 @@ Your ReShade configuration files will still be saved, and you can locate them by
   <data name="Enums.BootstrapperStyle.ByfronDialog" xml:space="preserve">
     <value>Fake Byfron (2023)</value>
   </data>
+  <data name="Enums.BootstrapperStyle.ClassicFluentDialog" xml:space="preserve">
+    <value>Fluent (Classic)</value>
+  </data>
+  <data name="Enums.BootstrapperStyle.FluentAeroDialog" xml:space="preserve">
+    <value>Fluent (Aero)</value>
+  </data>
+  <data name="Enums.BootstrapperStyle.FluentClassicDialog" xml:space="preserve">
+    <value>Fluent (Classic)</value>
+  </data>
   <data name="Enums.BootstrapperStyle.FluentDialog" xml:space="preserve">
     <value>Fluent</value>
   </data>
@@ -382,12 +391,6 @@ Your ReShade configuration files will still be saved, and you can locate them by
   <data name="Enums.BootstrapperStyle.ProgressDialog" xml:space="preserve">
     <value>Progress (~2014)</value>
   </data>
-  <data name="Enums.BootstrapperStyle.ProgressFluentAeroDialog" xml:space="preserve">
-    <value>Fluent Progress (Aero)</value>
-  </data>
-  <data name="Enums.BootstrapperStyle.ProgressFluentDialog" xml:space="preserve">
-    <value>Fluent Progress</value>
-  </data>
   <data name="Enums.BootstrapperStyle.VistaDialog" xml:space="preserve">
     <value>Vista (2008 - 2011)</value>
   </data>
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml
new file mode 100644
index 0000000..bf41ec3
--- /dev/null
+++ b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml
@@ -0,0 +1,47 @@
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Bootstrapper.ClassicFluentDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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"
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
+        xmlns:resources="clr-namespace:Bloxstrap.Resources"
+        mc:Ignorable="d"
+        Width="420"
+        MinHeight="0"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        Background="{ui:ThemeResource ApplicationBackgroundBrush}"
+        ExtendsContentIntoTitleBar="True"
+        WindowBackdropType="Mica"
+        WindowStartupLocation="CenterScreen"
+        Closing="UiWindow_Closing">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+      
+        <ui:TitleBar Grid.Row="0" x:Name="RootTitleBar" Padding="8" Title="{Binding Title, Mode=OneTime}" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" ShowClose="False" />
+      
+        <Grid Grid.Row="1" Margin="16,8,16,16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Image Grid.Column="0" Margin="0,12,0,0" Width="48" Height="48" VerticalAlignment="Top" Source="{Binding Icon, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" />
+            <StackPanel Grid.Column="1">
+                <TextBlock Margin="16,8,0,0" FontSize="20" Text="{Binding Message, Mode=OneWay}" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                <ProgressBar Margin="16,16,0,16" IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" Maximum="{Binding ProgressMaximum, Mode=OneWay}" Value="{Binding ProgressValue, Mode=OneWay}" />
+            </StackPanel>
+        </Grid>
+
+        <Border Grid.Row="2" Padding="15">
+            <Border.Background>
+                <SolidColorBrush Color="{ui:ThemeResource SolidBackgroundFillColorSecondary}" Opacity="{Binding FooterOpacity, Mode=OneTime}" />
+            </Border.Background>
+            <Button Margin="0" Content="{x:Static resources:Strings.Common_Cancel}" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
+        </Border>
+    </Grid>
+</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml.cs b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
similarity index 77%
rename from Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml.cs
rename to Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
index 462d5d2..c32d510 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
@@ -1,31 +1,21 @@
-using Bloxstrap.UI.Elements.Bootstrapper.Base;
-using Bloxstrap.UI.ViewModels.Bootstrapper;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
+using System.ComponentModel;
 using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Windows.Threading;
+
+using Wpf.Ui.Appearance;
+using Wpf.Ui.Mvvm.Contracts;
+using Wpf.Ui.Mvvm.Services;
+
+using Bloxstrap.UI.ViewModels.Bootstrapper;
+using Bloxstrap.UI.Elements.Bootstrapper.Base;
 
 namespace Bloxstrap.UI.Elements.Bootstrapper
 {
     /// <summary>
-    /// Interaction logic for ProgressFluentDialog.xaml
+    /// Interaction logic for ClassicFluentDialog.xaml
     /// </summary>
-    public partial class ProgressFluentDialog : IBootstrapperDialog
+    public partial class ClassicFluentDialog : IBootstrapperDialog
     {
-        private readonly ProgressFluentDialogViewModel _viewModel;
+        private readonly BootstrapperDialogViewModel _viewModel;
 
         public Bloxstrap.Bootstrapper? Bootstrapper { get; set; }
 
@@ -85,12 +75,12 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         }
         #endregion
 
-        public ProgressFluentDialog(bool aero)
+        public ClassicFluentDialog()
         {
             InitializeComponent();
             ApplyTheme();
 
-            _viewModel = new ProgressFluentDialogViewModel(this, aero);
+            _viewModel = new ClassicFluentDialogViewModel(this);
             DataContext = _viewModel;
             Title = App.Settings.Prop.BootstrapperTitle;
             Icon = App.Settings.Prop.BootstrapperIcon.GetIcon().GetImageSource();
@@ -114,4 +104,4 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         public void ShowSuccess(string message, Action? callback) => BaseFunctions.ShowSuccess(message, callback);
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
index 46d1ca7..0ddaa83 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
+++ b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
@@ -1,47 +1,80 @@
-<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Bootstrapper.FluentDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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"
-        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-        xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
-        xmlns:resources="clr-namespace:Bloxstrap.Resources"
-        mc:Ignorable="d"
-        Width="420"
-        MinHeight="0"
-        SizeToContent="Height"
-        ResizeMode="NoResize"
-        Background="{ui:ThemeResource ApplicationBackgroundBrush}"
-        ExtendsContentIntoTitleBar="True"
-        WindowBackdropType="Mica"
-        WindowStartupLocation="CenterScreen"
-        Closing="UiWindow_Closing">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-      
-        <ui:TitleBar Grid.Row="0" x:Name="RootTitleBar" Padding="8" Title="{Binding Title, Mode=OneTime}" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" ShowClose="False" />
-      
-        <Grid Grid.Row="1" Margin="16,8,16,16">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Image Grid.Column="0" Margin="0,12,0,0" Width="48" Height="48" VerticalAlignment="Top" Source="{Binding Icon, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" />
-            <StackPanel Grid.Column="1">
-                <TextBlock Margin="16,8,0,0" FontSize="20" Text="{Binding Message, Mode=OneWay}" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
-                <ProgressBar Margin="16,16,0,16" IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" Maximum="{Binding ProgressMaximum, Mode=OneWay}" Value="{Binding ProgressValue, Mode=OneWay}" />
-            </StackPanel>
-        </Grid>
+<base:WpfUiWindow
+    x:Class="Bloxstrap.UI.Elements.Bootstrapper.FluentDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resources="clr-namespace:Bloxstrap.Resources"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:vms="clr-namespace:Bloxstrap.UI.ViewModels.Bootstrapper"
+    Width="500"
+    Height="280"
+    MinHeight="0"
+    d:DataContext="{d:DesignInstance vms:FluentDialogViewModel,
+                                     IsDesignTimeCreatable=True}"
+    AllowsTransparency="True"
+    Background="{ui:ThemeResource ApplicationBackgroundBrush}"
+    Closing="UiWindow_Closing"
+    ExtendsContentIntoTitleBar="True"
+    ResizeMode="NoResize"
+    WindowBackdropType="{Binding Path=WindowBackdropType, Mode=OneTime}"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
 
-        <Border Grid.Row="2" Padding="15">
-            <Border.Background>
-                <SolidColorBrush Color="{ui:ThemeResource SolidBackgroundFillColorSecondary}" Opacity="{Binding FooterOpacity, Mode=OneTime}" />
-            </Border.Background>
-            <Button Margin="0" Content="{x:Static resources:Strings.Common_Cancel}" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
-        </Border>
+    <!--  Background is for Aero theme only  -->
+    <Grid Background="{Binding Path=BackgroundColourBrush, Mode=OneTime}">
+        <!--  Allow for drag  -->
+        <ui:TitleBar
+            VerticalAlignment="Top"
+            CanMaximize="False"
+            ShowClose="False"
+            ShowMaximize="False"
+            ShowMinimize="False" />
+
+        <Grid Margin="32,16">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Image
+                Grid.Row="0"
+                Width="80"
+                Height="80"
+                Margin="0,30,0,0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                RenderOptions.BitmapScalingMode="HighQuality"
+                Source="{Binding Icon, Mode=OneWay}" />
+
+            <TextBlock
+                Grid.Row="1"
+                Margin="0,0,0,8"
+                HorizontalAlignment="Center"
+                FontSize="18"
+                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                Text="{Binding Message, Mode=OneWay}" />
+
+            <ProgressBar
+                Grid.Row="2"
+                Margin="0,0,0,16"
+                IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}"
+                Maximum="{Binding ProgressMaximum, Mode=OneWay}"
+                Value="{Binding ProgressValue, Mode=OneWay}" />
+
+            <Button
+                Grid.Row="3"
+                Width="120"
+                Padding="4"
+                HorizontalAlignment="Center"
+                Command="{Binding CancelInstallCommand}"
+                Content="{x:Static resources:Strings.Common_Cancel}"
+                FontSize="14"
+                IsEnabled="{Binding CancelEnabled, Mode=OneWay}" />
+        </Grid>
     </Grid>
 </base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
index 780e75d..97220f6 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
@@ -1,12 +1,22 @@
-using System.ComponentModel;
-using System.Windows.Forms;
-
-using Wpf.Ui.Appearance;
-using Wpf.Ui.Mvvm.Contracts;
-using Wpf.Ui.Mvvm.Services;
-
+using Bloxstrap.UI.Elements.Bootstrapper.Base;
 using Bloxstrap.UI.ViewModels.Bootstrapper;
-using Bloxstrap.UI.Elements.Bootstrapper.Base;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Threading;
 
 namespace Bloxstrap.UI.Elements.Bootstrapper
 {
@@ -15,7 +25,7 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
     /// </summary>
     public partial class FluentDialog : IBootstrapperDialog
     {
-        private readonly BootstrapperDialogViewModel _viewModel;
+        private readonly FluentDialogViewModel _viewModel;
 
         public Bloxstrap.Bootstrapper? Bootstrapper { get; set; }
 
@@ -75,12 +85,12 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         }
         #endregion
 
-        public FluentDialog()
+        public FluentDialog(bool aero)
         {
             InitializeComponent();
             ApplyTheme();
 
-            _viewModel = new FluentDialogViewModel(this);
+            _viewModel = new FluentDialogViewModel(this, aero);
             DataContext = _viewModel;
             Title = App.Settings.Prop.BootstrapperTitle;
             Icon = App.Settings.Prop.BootstrapperIcon.GetIcon().GetImageSource();
@@ -104,4 +114,4 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         public void ShowSuccess(string message, Action? callback) => BaseFunctions.ShowSuccess(message, callback);
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml b/Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml
deleted file mode 100644
index c80cef3..0000000
--- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressFluentDialog.xaml
+++ /dev/null
@@ -1,80 +0,0 @@
-<base:WpfUiWindow
-    x:Class="Bloxstrap.UI.Elements.Bootstrapper.ProgressFluentDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:resources="clr-namespace:Bloxstrap.Resources"
-    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    xmlns:vms="clr-namespace:Bloxstrap.UI.ViewModels.Bootstrapper"
-    Width="500"
-    Height="280"
-    MinHeight="0"
-    d:DataContext="{d:DesignInstance vms:ProgressFluentDialogViewModel,
-                                     IsDesignTimeCreatable=True}"
-    AllowsTransparency="True"
-    Background="{ui:ThemeResource ApplicationBackgroundBrush}"
-    Closing="UiWindow_Closing"
-    ExtendsContentIntoTitleBar="True"
-    ResizeMode="NoResize"
-    WindowBackdropType="{Binding Path=WindowBackdropType, Mode=OneTime}"
-    WindowStartupLocation="CenterScreen"
-    WindowStyle="None"
-    mc:Ignorable="d">
-
-    <!--  Background is for Aero theme only  -->
-    <Grid Background="{Binding Path=BackgroundColourBrush, Mode=OneTime}">
-        <!--  Allow for drag  -->
-        <ui:TitleBar
-            VerticalAlignment="Top"
-            CanMaximize="False"
-            ShowClose="False"
-            ShowMaximize="False"
-            ShowMinimize="False" />
-
-        <Grid Margin="32,16">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Image
-                Grid.Row="0"
-                Width="80"
-                Height="80"
-                Margin="0,30,0,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Top"
-                RenderOptions.BitmapScalingMode="HighQuality"
-                Source="{Binding Icon, Mode=OneWay}" />
-
-            <TextBlock
-                Grid.Row="1"
-                Margin="0,0,0,8"
-                HorizontalAlignment="Center"
-                FontSize="18"
-                Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                Text="{Binding Message, Mode=OneWay}" />
-
-            <ProgressBar
-                Grid.Row="2"
-                Margin="0,0,0,16"
-                IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}"
-                Maximum="{Binding ProgressMaximum, Mode=OneWay}"
-                Value="{Binding ProgressValue, Mode=OneWay}" />
-
-            <Button
-                Grid.Row="3"
-                Width="120"
-                Padding="4"
-                HorizontalAlignment="Center"
-                Command="{Binding CancelInstallCommand}"
-                Content="{x:Static resources:Strings.Common_Cancel}"
-                FontSize="14"
-                IsEnabled="{Binding CancelEnabled, Mode=OneWay}" />
-        </Grid>
-    </Grid>
-</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Frontend.cs b/Bloxstrap/UI/Frontend.cs
index c4ddeef..f404016 100644
--- a/Bloxstrap/UI/Frontend.cs
+++ b/Bloxstrap/UI/Frontend.cs
@@ -55,11 +55,11 @@ namespace Bloxstrap.UI
                 BootstrapperStyle.LegacyDialog2008 => new LegacyDialog2008(),
                 BootstrapperStyle.LegacyDialog2011 => new LegacyDialog2011(),
                 BootstrapperStyle.ProgressDialog => new ProgressDialog(),
-                BootstrapperStyle.FluentDialog => new FluentDialog(),
+                BootstrapperStyle.ClassicFluentDialog => new ClassicFluentDialog(),
                 BootstrapperStyle.ByfronDialog => new ByfronDialog(),
-                BootstrapperStyle.ProgressFluentDialog => new ProgressFluentDialog(false),
-                BootstrapperStyle.ProgressFluentAeroDialog => new ProgressFluentDialog(true),
-                _ => new FluentDialog()
+                BootstrapperStyle.FluentDialog => new FluentDialog(false),
+                BootstrapperStyle.FluentAeroDialog => new FluentDialog(true),
+                _ => new FluentDialog(false)
             };
         }
     }
diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/ClassicFluentDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/ClassicFluentDialogViewModel.cs
new file mode 100644
index 0000000..bb45f1d
--- /dev/null
+++ b/Bloxstrap/UI/ViewModels/Bootstrapper/ClassicFluentDialogViewModel.cs
@@ -0,0 +1,15 @@
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Bloxstrap.UI.ViewModels.Bootstrapper
+{
+    public class ClassicFluentDialogViewModel : BootstrapperDialogViewModel
+    {
+        public double FooterOpacity => Environment.OSVersion.Version.Build >= 22000 ? 0.4 : 1;
+
+        public ClassicFluentDialogViewModel(IBootstrapperDialog dialog) : base(dialog)
+        {
+        }
+    }
+}
diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/FluentDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/FluentDialogViewModel.cs
index fd1a4ae..e523b48 100644
--- a/Bloxstrap/UI/ViewModels/Bootstrapper/FluentDialogViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Bootstrapper/FluentDialogViewModel.cs
@@ -1,15 +1,32 @@
-using System.Windows;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
+using Wpf.Ui.Appearance;
 
 namespace Bloxstrap.UI.ViewModels.Bootstrapper
 {
     public class FluentDialogViewModel : BootstrapperDialogViewModel
     {
-        public double FooterOpacity => Environment.OSVersion.Version.Build >= 22000 ? 0.4 : 1;
+        public BackgroundType WindowBackdropType { get; set; } = BackgroundType.Mica;
+        public SolidColorBrush BackgroundColourBrush { get; set; } = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
 
-        public FluentDialogViewModel(IBootstrapperDialog dialog) : base(dialog)
+        [Obsolete("Do not use this! This is for the designer only.", true)]
+        public FluentDialogViewModel() : base()
+        { }
+
+        public FluentDialogViewModel(IBootstrapperDialog dialog, bool aero) : base(dialog)
         {
+            const int alpha = 128;
+
+            WindowBackdropType = aero ? BackgroundType.Aero : BackgroundType.Mica;
+
+            if (aero)
+                BackgroundColourBrush = App.Settings.Prop.Theme.GetFinal() == Enums.Theme.Light ?
+                    new SolidColorBrush(Color.FromArgb(alpha, 225, 225, 225)) :
+                    new SolidColorBrush(Color.FromArgb(alpha, 30, 30, 30));
         }
     }
 }
diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/ProgressFluentDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/ProgressFluentDialogViewModel.cs
deleted file mode 100644
index 9290714..0000000
--- a/Bloxstrap/UI/ViewModels/Bootstrapper/ProgressFluentDialogViewModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Media;
-using Wpf.Ui.Appearance;
-
-namespace Bloxstrap.UI.ViewModels.Bootstrapper
-{
-    public class ProgressFluentDialogViewModel : BootstrapperDialogViewModel
-    {
-        public BackgroundType WindowBackdropType { get; set; } = BackgroundType.Mica;
-        public SolidColorBrush BackgroundColourBrush { get; set; } = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
-
-        [Obsolete("Do not use this! This is for the designer only.", true)]
-        public ProgressFluentDialogViewModel() : base()
-        { }
-
-        public ProgressFluentDialogViewModel(IBootstrapperDialog dialog, bool aero) : base(dialog)
-        {
-            const int alpha = 128;
-
-            WindowBackdropType = aero ? BackgroundType.Aero : BackgroundType.Mica;
-
-            if (aero)
-                BackgroundColourBrush = App.Settings.Prop.Theme.GetFinal() == Enums.Theme.Light ?
-                    new SolidColorBrush(Color.FromArgb(alpha, 225, 225, 225)) :
-                    new SolidColorBrush(Color.FromArgb(alpha, 30, 30, 30));
-        }
-    }
-}