From 85f67f75964d9b07621b668d62527bd5f42248e6 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 00:52:50 -0500
Subject: [PATCH 1/8] Regenerate WPF settings files with VS2022

---
 TwitchDownloaderWPF/App.config                | 19 -------------------
 .../Properties/Settings.settings              |  3 +--
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/TwitchDownloaderWPF/App.config b/TwitchDownloaderWPF/App.config
index 1493b5c6..94f6f763 100644
--- a/TwitchDownloaderWPF/App.config
+++ b/TwitchDownloaderWPF/App.config
@@ -5,25 +5,6 @@
             <section name="TwitchDownloaderWPF.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
     <userSettings>
         <TwitchDownloaderWPF.Properties.Settings>
             <setting name="VodDownloadThreads" serializeAs="String">
diff --git a/TwitchDownloaderWPF/Properties/Settings.settings b/TwitchDownloaderWPF/Properties/Settings.settings
index 39ca35c0..c365cb52 100644
--- a/TwitchDownloaderWPF/Properties/Settings.settings
+++ b/TwitchDownloaderWPF/Properties/Settings.settings
@@ -222,5 +222,4 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
-
+</SettingsFile>
\ No newline at end of file

From b015e0d222840293a854bcc6bb57ff731c0072fd Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:36:52 -0500
Subject: [PATCH 2/8] Add reset, save, and cancel buttons to settings window

---
 TwitchDownloaderWPF/WindowSettings.xaml    |  46 +++---
 TwitchDownloaderWPF/WindowSettings.xaml.cs | 172 +++++++++++++++++----
 2 files changed, 166 insertions(+), 52 deletions(-)

diff --git a/TwitchDownloaderWPF/WindowSettings.xaml b/TwitchDownloaderWPF/WindowSettings.xaml
index fb18ece7..283f5ebd 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml
+++ b/TwitchDownloaderWPF/WindowSettings.xaml
@@ -12,7 +12,7 @@
         xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:fa="http://schemas.fontawesome.com/icons/"
         mc:Ignorable="d"
-        Title="Global Settings" MinWidth="400" MinHeight="460" Width="500" Height="547" Initialized="Window_Initialized" Closing="Window_Closing">
+        Title="Global Settings" MinWidth="400" MinHeight="500" Width="500" Height="592" Initialized="Window_Initialized" Closing="Window_Closing" Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
             <Setter Property="behave:TextBoxTripleClickBehavior.TripleClickSelectLine" Value="True" />
@@ -28,44 +28,43 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="5"/>
             <RowDefinition Height="auto"/>
-            <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="5"/>
+            <RowDefinition Height="8"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical" Loaded="Window_Loaded">
+        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
             <WrapPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,9,3,3" Text="{lex:Loc CacheFolder}" Foreground="{DynamicResource AppText}"/>
-                <Button x:Name="btnClearCache" Margin="2" MinWidth="50" Content="{lex:Loc ClearCache}" Click="btnClearCache_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}"/>
-                <Button x:Name="btnTempBrowse" Margin="2" MinWidth="50" Content="{lex:Loc Browse}" Click="btnTempBrowse_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
-                <TextBox x:Name="textTempPath" Margin="2" MinWidth="250" MaxWidth="400" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <Button x:Name="BtnClearCache" Margin="2" MinWidth="50" Content="{lex:Loc ClearCache}" Click="btnClearCache_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}"/>
+                <Button x:Name="BtnTempBrowse" Margin="2" MinWidth="50" Content="{lex:Loc Browse}" Click="btnTempBrowse_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <TextBox x:Name="TextTempPath" Margin="2" MinWidth="250" MaxWidth="400" TextChanged="TextTempPath_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
             </WrapPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,4,3,3" Text="{lex:Loc HideDonationButton}" Foreground="{DynamicResource AppText}" />
-                <CheckBox x:Name="checkDonation" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" BorderBrush="{DynamicResource AppElementBorder}" />
+                <CheckBox x:Name="CheckDonation" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" Checked="CheckDonation_OnCheckedChanged" Unchecked="CheckDonation_OnCheckedChanged" BorderBrush="{DynamicResource AppElementBorder}" />
             </StackPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,4,3,3" Text="{lex:Loc SettingsTimeFormat}" Foreground="{DynamicResource AppText}" />
-                <RadioButton x:Name="radioTimeFormatUTC" Content="{lex:Loc TimestampUtc}" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
-                <RadioButton x:Name="radioTimeFormatLocal" IsChecked="True" Content="{lex:Loc TimestampLocal}" Margin="3,0,0,0" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <RadioButton x:Name="RadioTimeFormatUtc" Content="{lex:Loc TimestampUtc}" Checked="RadioTimeFormat_OnCheckedChanged" Unchecked="RadioTimeFormat_OnCheckedChanged" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <RadioButton x:Name="RadioTimeFormatLocal" IsChecked="True" Content="{lex:Loc TimestampLocal}" Margin="3,0,0,0" Checked="RadioTimeFormat_OnCheckedChanged" Unchecked="RadioTimeFormat_OnCheckedChanged" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
             </StackPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,4,3,3" Text="{lex:Loc VerboseErrors}" Foreground="{DynamicResource AppText}" />
-                <CheckBox x:Name="checkVerboseErrors" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" BorderBrush="{DynamicResource AppElementBorder}" />
+                <CheckBox x:Name="CheckVerboseErrors" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" Checked="CheckVerboseErrors_OnCheckedChanged" Unchecked="CheckVerboseErrors_OnCheckedChanged" BorderBrush="{DynamicResource AppElementBorder}" />
             </StackPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <!--TODO: Add theme creation window instead of just opening the theme folder-->
                 <TextBlock Margin="3,7,3,3" Foreground="{DynamicResource AppText}"><Run Text="{lex:Loc ApplicationTheme}"/><Hyperlink ToolTipService.ShowDuration="30000" NavigateUri="Themes" RequestNavigate="Hyperlink_RequestNavigate" Foreground="{DynamicResource AppHyperlink}"><Hyperlink.ToolTip><Run Text="{lex:Loc ApplicationThemeTooltip}"/></Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock>
-                <ComboBox x:Name="comboTheme" MinWidth="100" MaxWidth="345" HorizontalAlignment="Left" SelectionChanged="comboTheme_SelectionChanged" Margin="3,0,3,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <ComboBox x:Name="ComboTheme" MinWidth="100" MaxWidth="345" HorizontalAlignment="Left" SelectionChanged="ComboTheme_OnSelectionChanged" Margin="3,0,3,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
             </StackPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <fa:SvgAwesome Margin="3,2,1,-2" Icon="Solid_Language" Width="32" Height="26" Foreground="{DynamicResource AppText}" />
                 <TextBlock Margin="3,8,3,3" Foreground="{DynamicResource AppText}"><Run Text="{lex:Loc ApplicationLanguage}"/><Hyperlink ToolTipService.ShowDuration="30000" NavigateUri="https://github.com/lay295/TwitchDownloader/blob/master/TwitchDownloaderWPF/README.md#localization" RequestNavigate="Hyperlink_RequestNavigate" Foreground="{DynamicResource AppHyperlink}"><Hyperlink.ToolTip><Run Text="{lex:Loc ApplicationLanguageTooltip}"/></Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock>
-                <ComboBox x:Name="comboLocale" MinWidth="100" MaxWidth="330" HorizontalAlignment="Left" SelectionChanged="comboLocale_SelectionChanged" Margin="3,0,3,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <ComboBox x:Name="ComboLocale" MinWidth="100" MaxWidth="330" HorizontalAlignment="Left" SelectionChanged="ComboLocale_OnSelectionChanged" Margin="3,0,3,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
             </StackPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,7,3,3" Foreground="{DynamicResource AppText}"><Run Text="{lex:Loc MaximumThreadBandwidth}" /><Hyperlink ToolTipService.ShowDuration="30000" Foreground="{DynamicResource AppHyperlink}"><Hyperlink.ToolTip><Run Text="{lex:Loc MaximumThreadBandwidthTooltip}" /></Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock>
-                <CheckBox x:Name="CheckThrottleEnabled" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="1, 6, 3, 3" Checked="CheckThrottleEnabled_CheckedChanged" Unchecked="CheckThrottleEnabled_CheckedChanged" BorderBrush="{DynamicResource AppElementBorder}" />
-                <hc:NumericUpDown x:Name="NumMaximumBandwidth" Value="4096" Minimum="1" Maximum="122070" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                <CheckBox x:Name="CheckThrottleEnabled" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="1, 6, 3, 3" Checked="CheckThrottleEnabled_OnCheckedChanged" Unchecked="CheckThrottleEnabled_OnCheckedChanged" BorderBrush="{DynamicResource AppElementBorder}" />
+                <hc:NumericUpDown x:Name="NumMaximumBandwidth" Value="4096" Minimum="1" Maximum="122070" ValueChanged="NumMaximumBandwidth_OnValueChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
                 <TextBlock Margin="3,7,0,0" Text="KiB/s" Foreground="{DynamicResource AppText}" />
             </StackPanel>
             <TextBlock Margin="3,5,3,3" Text="{lex:Loc DownloadFilenameTemplates}" Foreground="{DynamicResource AppText}" />
@@ -76,9 +75,9 @@
                     <TextBlock Margin="3,18,3,3" Text="{lex:Loc TemplateChats}" Foreground="{DynamicResource AppText}" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
-                    <TextBox x:Name="textVodTemplate" Margin="3,5,3,3" MinWidth="300" MaxWidth="420" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
-                    <TextBox x:Name="textClipTemplate" Margin="3" MinWidth="300" MaxWidth="420" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
-                    <TextBox x:Name="textChatTemplate" Margin="3" MinWidth="300" MaxWidth="420" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                    <TextBox x:Name="TextVodTemplate" Margin="3,5,3,3" MinWidth="300" MaxWidth="420" TextChanged="TextVodTemplate_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                    <TextBox x:Name="TextClipTemplate" Margin="3" MinWidth="300" MaxWidth="420" TextChanged="TextClipTemplate_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
+                    <TextBox x:Name="TextChatTemplate" Margin="3" MinWidth="300" MaxWidth="420" TextChanged="TextChatTemplate_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
                 </StackPanel>
             </StackPanel>
             <TextBlock Margin="3,5,3,3" Foreground="{DynamicResource AppText}" TextWrapping="Wrap">
@@ -92,5 +91,16 @@
                 <Hyperlink NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-timespan-format-strings" RequestNavigate="Hyperlink_RequestNavigate" Foreground="{DynamicResource AppHyperlink}"><Run Text="{lex:Loc TimeSpanCustomFormattingHyperlink}" /></Hyperlink>
             </TextBlock>
         </StackPanel>
+        <Grid Grid.Row="2" Grid.Column="1" VerticalAlignment="Bottom" MinHeight="30">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="0" x:Name="BtnResetSettings" Content="Restore Defaults" HorizontalAlignment="Left" Click="BtnResetSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button x:Name="BtnSaveSettings" Margin="2,0,2,0" MinWidth="50" Content="Save" Click="BtnSaveSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <Button x:Name="BtnCancelSettings" Margin="2,0,2, 0" MinWidth="50" Content="Cancel" Click="BtnCancelSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+            </StackPanel>
+        </Grid>
     </Grid>
 </Window>
diff --git a/TwitchDownloaderWPF/WindowSettings.xaml.cs b/TwitchDownloaderWPF/WindowSettings.xaml.cs
index 7eb419ac..d46ff03f 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml.cs
+++ b/TwitchDownloaderWPF/WindowSettings.xaml.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using HandyControl.Data;
 using TwitchDownloaderWPF.Properties;
 using TwitchDownloaderWPF.Services;
 using MessageBox = System.Windows.MessageBox;
@@ -15,6 +16,10 @@ namespace TwitchDownloaderWPF
     /// </summary>
     public partial class WindowSettings : Window
     {
+        private bool _cancelSettingsChanges = true;
+        private bool _refreshThemeOnCancel;
+        private bool _refreshCultureOnCancel;
+
         public WindowSettings()
         {
             InitializeComponent();
@@ -25,7 +30,7 @@ private void btnTempBrowse_Click(object sender, RoutedEventArgs e)
             var dialog = new Ookii.Dialogs.Wpf.VistaFolderBrowserDialog();
             if (dialog.ShowDialog(this).GetValueOrDefault())
             {
-                textTempPath.Text = dialog.SelectedPath;
+                TextTempPath.Text = dialog.SelectedPath;
             }
         }
 
@@ -33,39 +38,39 @@ private void Window_Initialized(object sender, EventArgs e)
         {
             if (Settings.Default.TempPath == "")
             {
-                textTempPath.Text = Path.GetTempPath().TrimEnd('\\');
+                TextTempPath.Text = Path.GetTempPath().TrimEnd('\\');
             }
             else
             {
-                textTempPath.Text = Settings.Default.TempPath;
+                TextTempPath.Text = Settings.Default.TempPath;
             }
 
-            textVodTemplate.Text = Settings.Default.TemplateVod;
-            textClipTemplate.Text = Settings.Default.TemplateClip;
-            textChatTemplate.Text = Settings.Default.TemplateChat;
-            checkDonation.IsChecked = Settings.Default.HideDonation;
-            checkVerboseErrors.IsChecked = Settings.Default.VerboseErrors;
+            TextVodTemplate.Text = Settings.Default.TemplateVod;
+            TextClipTemplate.Text = Settings.Default.TemplateClip;
+            TextChatTemplate.Text = Settings.Default.TemplateChat;
+            CheckDonation.IsChecked = Settings.Default.HideDonation;
+            CheckVerboseErrors.IsChecked = Settings.Default.VerboseErrors;
             NumMaximumBandwidth.Value = Settings.Default.MaximumBandwidthKib;
             NumMaximumBandwidth.IsEnabled = Settings.Default.DownloadThrottleEnabled;
             CheckThrottleEnabled.IsChecked = Settings.Default.DownloadThrottleEnabled;
-            radioTimeFormatUTC.IsChecked = Settings.Default.UTCVideoTime;
+            RadioTimeFormatUtc.IsChecked = Settings.Default.UTCVideoTime;
 
             if (Directory.Exists("Themes"))
             {
                 // Setup theme dropdown
-                comboTheme.Items.Add("System"); // Cannot be localized
+                ComboTheme.Items.Add("System"); // Cannot be localized
                 string[] themeFiles = Directory.GetFiles("Themes", "*.xaml");
                 foreach (string themeFile in themeFiles)
                 {
-                    comboTheme.Items.Add(Path.GetFileNameWithoutExtension(themeFile));
+                    ComboTheme.Items.Add(Path.GetFileNameWithoutExtension(themeFile));
                 }
-                comboTheme.SelectedItem = Settings.Default.GuiTheme;
+                ComboTheme.SelectedItem = Settings.Default.GuiTheme;
             }
 
             // Setup culture dropdown
             foreach (var culture in AvailableCultures.All)
             {
-                comboLocale.Items.Add(culture.NativeName);
+                ComboLocale.Items.Add(culture.NativeName);
             }
             var currentCulture = Settings.Default.GuiCulture;
             var selectedIndex = AvailableCultures.All.Select((item, index) => new { item, index })
@@ -76,7 +81,7 @@ private void Window_Initialized(object sender, EventArgs e)
 
             if (selectedIndex > -1)
             {
-                comboLocale.SelectedIndex = selectedIndex;
+                ComboLocale.SelectedIndex = selectedIndex;
             }
         }
 
@@ -113,18 +118,21 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             App.RequestTitleBarChange();
         }
 
-        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void Window_Closing(object sender, EventArgs e)
         {
-            Settings.Default.TemplateVod = textVodTemplate.Text;
-            Settings.Default.TemplateClip = textClipTemplate.Text;
-            Settings.Default.TemplateChat = textChatTemplate.Text;
-            Settings.Default.TempPath = textTempPath.Text;
-            Settings.Default.HideDonation = checkDonation.IsChecked.GetValueOrDefault();
-            Settings.Default.VerboseErrors = checkVerboseErrors.IsChecked.GetValueOrDefault();
-            Settings.Default.MaximumBandwidthKib = (int)NumMaximumBandwidth.Value;
-            Settings.Default.UTCVideoTime = radioTimeFormatUTC.IsChecked.GetValueOrDefault();
-            Settings.Default.DownloadThrottleEnabled = CheckThrottleEnabled.IsChecked.GetValueOrDefault();
-            Settings.Default.Save();
+            if (_cancelSettingsChanges)
+            {
+                Settings.Default.Reload();
+                if (_refreshThemeOnCancel)
+                {
+                    App.RequestAppThemeChange();
+                }
+
+                if (_refreshCultureOnCancel)
+                {
+                    App.RequestCultureChange();
+                }
+            }
         }
 
         private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
@@ -140,34 +148,130 @@ private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.
             e.Handled = true;
         }
 
-        private void comboTheme_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void ComboTheme_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (!((string)comboTheme.SelectedItem).Equals(Settings.Default.GuiTheme, StringComparison.OrdinalIgnoreCase))
+            if (!IsInitialized)
+                return;
+
+            if (!((string)ComboTheme.SelectedItem).Equals(Settings.Default.GuiTheme, StringComparison.OrdinalIgnoreCase))
             {
-                Settings.Default.GuiTheme = (string)comboTheme.SelectedItem;
+                _refreshThemeOnCancel = true;
+                Settings.Default.GuiTheme = (string)ComboTheme.SelectedItem;
                 App.RequestAppThemeChange();
             }
         }
 
-        private void comboLocale_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void ComboLocale_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (comboLocale.SelectedIndex == -1)
-            {
+            if (!IsInitialized)
                 return;
-            }
 
-            var selectedCulture = AvailableCultures.All[comboLocale.SelectedIndex].Code;
+            if (ComboLocale.SelectedIndex == -1)
+                return;
+
+            var selectedCulture = AvailableCultures.All[ComboLocale.SelectedIndex].Code;
             if (selectedCulture != Settings.Default.GuiCulture)
             {
+                _refreshCultureOnCancel = true;
                 Settings.Default.GuiCulture = selectedCulture;
                 App.RequestCultureChange();
                 Title = Translations.Strings.TitleGlobalSettings;
             }
         }
 
-        private void CheckThrottleEnabled_CheckedChanged(object sender, RoutedEventArgs e)
+        private void CheckThrottleEnabled_OnCheckedChanged(object sender, RoutedEventArgs e)
         {
+            if (!IsInitialized)
+                return;
+
             NumMaximumBandwidth.IsEnabled = CheckThrottleEnabled.IsChecked.GetValueOrDefault();
+            Settings.Default.DownloadThrottleEnabled = CheckThrottleEnabled.IsChecked.GetValueOrDefault();
+        }
+
+        private void NumMaximumBandwidth_OnValueChanged(object sender, FunctionEventArgs<double> e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.MaximumBandwidthKib = (int)NumMaximumBandwidth.Value;
+        }
+
+        private void BtnResetSettings_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show("Are you sure you want to reset all settings to their default values?", "Restore Settings Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+            {
+                Settings.Default.Reset();
+                Settings.Default.Save();
+                MessageBox.Show("The application must be restarted for changes to take effect.", $"Please restart {nameof(TwitchDownloaderWPF)}", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
+        private void BtnSaveSettings_OnClick(object sender, RoutedEventArgs e)
+        {
+            _cancelSettingsChanges = false;
+            Settings.Default.Save();
+            Close();
+        }
+
+        private void BtnCancelSettings_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void TextTempPath_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.TempPath = TextTempPath.Text;
+        }
+
+        private void CheckDonation_OnCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.HideDonation = CheckDonation.IsChecked.GetValueOrDefault();
+        }
+
+        private void RadioTimeFormat_OnCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.UTCVideoTime = RadioTimeFormatUtc.IsChecked.GetValueOrDefault();
+        }
+
+        private void CheckVerboseErrors_OnCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.VerboseErrors = CheckVerboseErrors.IsChecked.GetValueOrDefault();
+        }
+
+        private void TextVodTemplate_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.TemplateVod = TextVodTemplate.Text;
+        }
+
+        private void TextClipTemplate_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.TemplateClip = TextClipTemplate.Text;
+        }
+
+        private void TextChatTemplate_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.TemplateChat = TextChatTemplate.Text;
         }
     }
 }

From fd7d8aa403d4ceb516e4536aa693a7eaa022f001 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:45:45 -0500
Subject: [PATCH 3/8] Use translations

---
 .../Translations/Strings.Designer.cs          | 36 +++++++++++++++++++
 .../Translations/Strings.es.resx              | 12 +++++++
 .../Translations/Strings.fr.resx              | 12 +++++++
 .../Translations/Strings.pl.resx              | 12 +++++++
 TwitchDownloaderWPF/Translations/Strings.resx | 12 +++++++
 .../Translations/Strings.ru.resx              | 12 +++++++
 .../Translations/Strings.tr.resx              | 12 +++++++
 .../Translations/Strings.uk.resx              | 12 +++++++
 .../Translations/Strings.zh.resx              | 12 +++++++
 TwitchDownloaderWPF/WindowSettings.xaml.cs    |  4 +--
 10 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/TwitchDownloaderWPF/Translations/Strings.Designer.cs b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
index e41a9ea0..1e51cbf5 100644
--- a/TwitchDownloaderWPF/Translations/Strings.Designer.cs
+++ b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
@@ -1301,6 +1301,33 @@ public static string ReplaceEmbedsTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Restore Settings Confirmation.
+        /// </summary>
+        public static string ResetSettingsConfirmation {
+            get {
+                return ResourceManager.GetString("ResetSettingsConfirmation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure you want to reset all settings to their default values?.
+        /// </summary>
+        public static string ResetSettingsConfirmationMessage {
+            get {
+                return ResourceManager.GetString("ResetSettingsConfirmationMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please restart {0}.
+        /// </summary>
+        public static string RestartTheApplication {
+            get {
+                return ResourceManager.GetString("RestartTheApplication", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Search Clips.
         /// </summary>
@@ -1553,6 +1580,15 @@ public static string TemplateVods {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The application must be restarted for changes to take effect..
+        /// </summary>
+        public static string TheApplicationMustBeRestartedMessage {
+            get {
+                return ResourceManager.GetString("TheApplicationMustBeRestartedMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Theme not found.
         /// </summary>
diff --git a/TwitchDownloaderWPF/Translations/Strings.es.resx b/TwitchDownloaderWPF/Translations/Strings.es.resx
index d40389e1..0d09ff50 100644
--- a/TwitchDownloaderWPF/Translations/Strings.es.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.es.resx
@@ -787,4 +787,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
index a416e24e..5f56da70 100644
--- a/TwitchDownloaderWPF/Translations/Strings.fr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -786,4 +786,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Ouvrir dans un navigateur web</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
index 858d3e5d..e7f8d777 100644
--- a/TwitchDownloaderWPF/Translations/Strings.pl.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -786,4 +786,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
index 709896f7..b02fc661 100644
--- a/TwitchDownloaderWPF/Translations/Strings.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -785,4 +785,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
index a627640d..618f9797 100644
--- a/TwitchDownloaderWPF/Translations/Strings.ru.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -786,4 +786,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
index a2b08a71..9e54d055 100644
--- a/TwitchDownloaderWPF/Translations/Strings.tr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -787,4 +787,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
index d7bce07f..2a7a95af 100644
--- a/TwitchDownloaderWPF/Translations/Strings.uk.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -786,4 +786,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.zh.resx b/TwitchDownloaderWPF/Translations/Strings.zh.resx
index fe1a87c8..89e53554 100644
--- a/TwitchDownloaderWPF/Translations/Strings.zh.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.zh.resx
@@ -785,4 +785,16 @@
   <data name="OpenVideoInBrowser" xml:space="preserve">
     <value>Open in browser</value>
   </data>
+  <data name="ResetSettingsConfirmationMessage" xml:space="preserve">
+    <value>Are you sure you want to reset all settings to their default values?</value>
+  </data>
+  <data name="ResetSettingsConfirmation" xml:space="preserve">
+    <value>Restore Settings Confirmation</value>
+  </data>
+  <data name="TheApplicationMustBeRestartedMessage" xml:space="preserve">
+    <value>The application must be restarted for changes to take effect.</value>
+  </data>
+  <data name="RestartTheApplication" xml:space="preserve">
+    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/WindowSettings.xaml.cs b/TwitchDownloaderWPF/WindowSettings.xaml.cs
index d46ff03f..0b6868ca 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml.cs
+++ b/TwitchDownloaderWPF/WindowSettings.xaml.cs
@@ -198,11 +198,11 @@ private void NumMaximumBandwidth_OnValueChanged(object sender, FunctionEventArgs
 
         private void BtnResetSettings_OnClick(object sender, RoutedEventArgs e)
         {
-            if (MessageBox.Show("Are you sure you want to reset all settings to their default values?", "Restore Settings Confirmation", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
+            if (MessageBox.Show(Translations.Strings.ResetSettingsConfirmationMessage, Translations.Strings.ResetSettingsConfirmationMessage, MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
             {
                 Settings.Default.Reset();
                 Settings.Default.Save();
-                MessageBox.Show("The application must be restarted for changes to take effect.", $"Please restart {nameof(TwitchDownloaderWPF)}", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show(Translations.Strings.TheApplicationMustBeRestartedMessage, string.Format(Translations.Strings.RestartTheApplication, nameof(TwitchDownloaderWPF)), MessageBoxButton.OK, MessageBoxImage.Information);
             }
         }
 

From 568c3df7a26bb1f7d6a5bfa767cf61ff87810edd Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:50:14 -0500
Subject: [PATCH 4/8] Use translations for buttons

---
 .../Translations/Strings.Designer.cs          | 27 +++++++++++++++++++
 .../Translations/Strings.es.resx              |  9 +++++++
 .../Translations/Strings.fr.resx              |  9 +++++++
 .../Translations/Strings.pl.resx              |  9 +++++++
 TwitchDownloaderWPF/Translations/Strings.resx |  9 +++++++
 .../Translations/Strings.ru.resx              |  9 +++++++
 .../Translations/Strings.tr.resx              |  9 +++++++
 .../Translations/Strings.uk.resx              |  9 +++++++
 .../Translations/Strings.zh.resx              |  9 +++++++
 TwitchDownloaderWPF/WindowSettings.xaml       | 10 +++----
 10 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/TwitchDownloaderWPF/Translations/Strings.Designer.cs b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
index 1e51cbf5..029c7994 100644
--- a/TwitchDownloaderWPF/Translations/Strings.Designer.cs
+++ b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
@@ -212,6 +212,33 @@ public static string BttvEmotes {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel.
+        /// </summary>
+        public static string ButtonCancelSettingsChanges {
+            get {
+                return ResourceManager.GetString("ButtonCancelSettingsChanges", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Restore Defaults.
+        /// </summary>
+        public static string ButtonRestoreDefaultSettings {
+            get {
+                return ResourceManager.GetString("ButtonRestoreDefaultSettings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        public static string ButtonSaveSettings {
+            get {
+                return ResourceManager.GetString("ButtonSaveSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cache Folder:.
         /// </summary>
diff --git a/TwitchDownloaderWPF/Translations/Strings.es.resx b/TwitchDownloaderWPF/Translations/Strings.es.resx
index 0d09ff50..9c927695 100644
--- a/TwitchDownloaderWPF/Translations/Strings.es.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.es.resx
@@ -799,4 +799,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
index 5f56da70..2198da93 100644
--- a/TwitchDownloaderWPF/Translations/Strings.fr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -798,4 +798,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
index e7f8d777..a5fcf1a6 100644
--- a/TwitchDownloaderWPF/Translations/Strings.pl.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -798,4 +798,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
index b02fc661..daf7db86 100644
--- a/TwitchDownloaderWPF/Translations/Strings.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -797,4 +797,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
index 618f9797..7f93d7c6 100644
--- a/TwitchDownloaderWPF/Translations/Strings.ru.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -798,4 +798,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
index 9e54d055..2834c2d1 100644
--- a/TwitchDownloaderWPF/Translations/Strings.tr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -799,4 +799,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
index 2a7a95af..2ad51ee4 100644
--- a/TwitchDownloaderWPF/Translations/Strings.uk.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -798,4 +798,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/Translations/Strings.zh.resx b/TwitchDownloaderWPF/Translations/Strings.zh.resx
index 89e53554..7bac81d4 100644
--- a/TwitchDownloaderWPF/Translations/Strings.zh.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.zh.resx
@@ -797,4 +797,13 @@
   <data name="RestartTheApplication" xml:space="preserve">
     <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
   </data>
+  <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
+    <value>Restore Defaults</value>
+  </data>
+  <data name="ButtonSaveSettings" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="ButtonCancelSettingsChanges" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TwitchDownloaderWPF/WindowSettings.xaml b/TwitchDownloaderWPF/WindowSettings.xaml
index 283f5ebd..b766e1ab 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml
+++ b/TwitchDownloaderWPF/WindowSettings.xaml
@@ -93,13 +93,13 @@
         </StackPanel>
         <Grid Grid.Row="2" Grid.Column="1" VerticalAlignment="Bottom" MinHeight="30">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" x:Name="BtnResetSettings" Content="Restore Defaults" HorizontalAlignment="Left" Click="BtnResetSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+            <Button Grid.Column="0" x:Name="BtnResetSettings" Content="{lex:Loc ButtonRestoreDefaultSettings}" HorizontalAlignment="Left" Click="BtnResetSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button x:Name="BtnSaveSettings" Margin="2,0,2,0" MinWidth="50" Content="Save" Click="BtnSaveSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
-                <Button x:Name="BtnCancelSettings" Margin="2,0,2, 0" MinWidth="50" Content="Cancel" Click="BtnCancelSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <Button x:Name="BtnSaveSettings" Margin="2,0,2,0" MinWidth="50" Content="{lex:Loc ButtonSaveSettings}" Click="BtnSaveSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <Button x:Name="BtnCancelSettings" Margin="2,0,2, 0" MinWidth="50" Content="{lex:Loc ButtonCancelSettingsChanges}" Click="BtnCancelSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
             </StackPanel>
         </Grid>
     </Grid>

From 17c872d6602e27e385e33d3decc51fabeecf1b66 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:54:33 -0500
Subject: [PATCH 5/8] Update margin

---
 TwitchDownloaderWPF/WindowSettings.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TwitchDownloaderWPF/WindowSettings.xaml b/TwitchDownloaderWPF/WindowSettings.xaml
index b766e1ab..ddb07c6d 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml
+++ b/TwitchDownloaderWPF/WindowSettings.xaml
@@ -99,7 +99,7 @@
             <Button Grid.Column="0" x:Name="BtnResetSettings" Content="{lex:Loc ButtonRestoreDefaultSettings}" HorizontalAlignment="Left" Click="BtnResetSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button x:Name="BtnSaveSettings" Margin="2,0,2,0" MinWidth="50" Content="{lex:Loc ButtonSaveSettings}" Click="BtnSaveSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
-                <Button x:Name="BtnCancelSettings" Margin="2,0,2, 0" MinWidth="50" Content="{lex:Loc ButtonCancelSettingsChanges}" Click="BtnCancelSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <Button x:Name="BtnCancelSettings" Margin="2,0,0, 0" MinWidth="50" Content="{lex:Loc ButtonCancelSettingsChanges}" Click="BtnCancelSettings_OnClick" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
             </StackPanel>
         </Grid>
     </Grid>

From 1a21549db929cef6b894d19dde98738e177a1de9 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 02:55:54 -0500
Subject: [PATCH 6/8] Minor nitpicks

---
 TwitchDownloaderWPF/WindowSettings.xaml    | 4 ++--
 TwitchDownloaderWPF/WindowSettings.xaml.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TwitchDownloaderWPF/WindowSettings.xaml b/TwitchDownloaderWPF/WindowSettings.xaml
index ddb07c6d..67b9c24a 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml
+++ b/TwitchDownloaderWPF/WindowSettings.xaml
@@ -34,8 +34,8 @@
         <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
             <WrapPanel Margin="0,0,0,10" Orientation="Horizontal">
                 <TextBlock Margin="3,9,3,3" Text="{lex:Loc CacheFolder}" Foreground="{DynamicResource AppText}"/>
-                <Button x:Name="BtnClearCache" Margin="2" MinWidth="50" Content="{lex:Loc ClearCache}" Click="btnClearCache_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}"/>
-                <Button x:Name="BtnTempBrowse" Margin="2" MinWidth="50" Content="{lex:Loc Browse}" Click="btnTempBrowse_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
+                <Button x:Name="BtnClearCache" Margin="2" MinWidth="50" Content="{lex:Loc ClearCache}" Click="BtnClearCache_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}"/>
+                <Button x:Name="BtnTempBrowse" Margin="2" MinWidth="50" Content="{lex:Loc Browse}" Click="BtnTempBrowse_Click" Background="{DynamicResource ActionButtonBackground}" BorderBrush="{DynamicResource ActionButtonBorder}" Foreground="{DynamicResource ActionButtonText}" />
                 <TextBox x:Name="TextTempPath" Margin="2" MinWidth="250" MaxWidth="400" TextChanged="TextTempPath_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
             </WrapPanel>
             <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
diff --git a/TwitchDownloaderWPF/WindowSettings.xaml.cs b/TwitchDownloaderWPF/WindowSettings.xaml.cs
index 0b6868ca..ad2709e8 100644
--- a/TwitchDownloaderWPF/WindowSettings.xaml.cs
+++ b/TwitchDownloaderWPF/WindowSettings.xaml.cs
@@ -25,7 +25,7 @@ public WindowSettings()
             InitializeComponent();
         }
 
-        private void btnTempBrowse_Click(object sender, RoutedEventArgs e)
+        private void BtnTempBrowse_Click(object sender, RoutedEventArgs e)
         {
             var dialog = new Ookii.Dialogs.Wpf.VistaFolderBrowserDialog();
             if (dialog.ShowDialog(this).GetValueOrDefault())
@@ -73,7 +73,7 @@ private void Window_Initialized(object sender, EventArgs e)
                 ComboLocale.Items.Add(culture.NativeName);
             }
             var currentCulture = Settings.Default.GuiCulture;
-            var selectedIndex = AvailableCultures.All.Select((item, index) => new { item, index })
+            var selectedIndex = AvailableCultures.All.Select((item, index) => (item, index))
                 .Where(x => x.item.Code == currentCulture)
                 .Select(x => x.index)
                 .DefaultIfEmpty(-1)
@@ -85,7 +85,7 @@ private void Window_Initialized(object sender, EventArgs e)
             }
         }
 
-        private void btnClearCache_Click(object sender, RoutedEventArgs e)
+        private void BtnClearCache_Click(object sender, RoutedEventArgs e)
         {
             MessageBoxResult messageBoxResult = MessageBox.Show(Translations.Strings.ClearCacheConfirmation.Replace(@"\n", Environment.NewLine), Translations.Strings.DeleteConfirmation, MessageBoxButton.YesNo);
             if (messageBoxResult == MessageBoxResult.Yes)

From dacb6c44c8d362d5a895c33bb2e1b4d9c3c7f735 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:18:37 -0500
Subject: [PATCH 7/8] Fix typo

---
 TwitchDownloaderWPF/Translations/Strings.es.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.fr.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.pl.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.resx    | 2 +-
 TwitchDownloaderWPF/Translations/Strings.ru.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.tr.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.uk.resx | 2 +-
 TwitchDownloaderWPF/Translations/Strings.zh.resx | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TwitchDownloaderWPF/Translations/Strings.es.resx b/TwitchDownloaderWPF/Translations/Strings.es.resx
index 9c927695..568f48d1 100644
--- a/TwitchDownloaderWPF/Translations/Strings.es.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.es.resx
@@ -797,7 +797,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
index 2198da93..45f8f118 100644
--- a/TwitchDownloaderWPF/Translations/Strings.fr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -796,7 +796,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
index a5fcf1a6..4f9dc0eb 100644
--- a/TwitchDownloaderWPF/Translations/Strings.pl.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -796,7 +796,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
index daf7db86..1a02f8dd 100644
--- a/TwitchDownloaderWPF/Translations/Strings.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -795,7 +795,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
index 7f93d7c6..8ed83776 100644
--- a/TwitchDownloaderWPF/Translations/Strings.ru.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -796,7 +796,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
index 2834c2d1..dc891514 100644
--- a/TwitchDownloaderWPF/Translations/Strings.tr.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -797,7 +797,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
index 2ad51ee4..b5da2fec 100644
--- a/TwitchDownloaderWPF/Translations/Strings.uk.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -796,7 +796,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>
diff --git a/TwitchDownloaderWPF/Translations/Strings.zh.resx b/TwitchDownloaderWPF/Translations/Strings.zh.resx
index 7bac81d4..f21e381d 100644
--- a/TwitchDownloaderWPF/Translations/Strings.zh.resx
+++ b/TwitchDownloaderWPF/Translations/Strings.zh.resx
@@ -795,7 +795,7 @@
     <value>The application must be restarted for changes to take effect.</value>
   </data>
   <data name="RestartTheApplication" xml:space="preserve">
-    <value>Please restart {0}</value><comment>{0] is the name of the application.</comment>
+    <value>Please restart {0}</value><comment>{0} is the name of the application.</comment>
   </data>
   <data name="ButtonRestoreDefaultSettings" xml:space="preserve">
     <value>Restore Defaults</value>

From 2cadd4b15029373ff5263f2cf544b7d7ccc91201 Mon Sep 17 00:00:00 2001
From: ScrubN <72096833+ScrubN@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:36:13 -0500
Subject: [PATCH 8/8] Update some default settings

---
 TwitchDownloaderWPF/App.config                      | 6 +++---
 TwitchDownloaderWPF/Properties/Settings.Designer.cs | 6 +++---
 TwitchDownloaderWPF/Properties/Settings.settings    | 9 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/TwitchDownloaderWPF/App.config b/TwitchDownloaderWPF/App.config
index 94f6f763..c8f358de 100644
--- a/TwitchDownloaderWPF/App.config
+++ b/TwitchDownloaderWPF/App.config
@@ -11,7 +11,7 @@
                 <value>4</value>
             </setting>
             <setting name="Font" serializeAs="String">
-                <value>Arial</value>
+                <value>Inter Embedded</value>
             </setting>
             <setting name="FontSize" serializeAs="String">
                 <value>24</value>
@@ -29,7 +29,7 @@
                 <value>700</value>
             </setting>
             <setting name="UpdateTime" serializeAs="String">
-                <value>0.5</value>
+                <value>0.2</value>
             </setting>
             <setting name="FFZEmotes" serializeAs="String">
                 <value>True</value>
@@ -197,7 +197,7 @@
                 <value>1</value>
             </setting>
             <setting name="DisperseCommentOffsets" serializeAs="String">
-                <value>False</value>
+                <value>True</value>
             </setting>
             <setting name="GuiCulture" serializeAs="String">
                 <value>en-US</value>
diff --git a/TwitchDownloaderWPF/Properties/Settings.Designer.cs b/TwitchDownloaderWPF/Properties/Settings.Designer.cs
index 66d5e122..0cda5f22 100644
--- a/TwitchDownloaderWPF/Properties/Settings.Designer.cs
+++ b/TwitchDownloaderWPF/Properties/Settings.Designer.cs
@@ -36,7 +36,7 @@ public int VodDownloadThreads {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Arial")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Inter Embedded")]
         public string Font {
             get {
                 return ((string)(this["Font"]));
@@ -108,7 +108,7 @@ public int Width {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0.5")]
+        [global::System.Configuration.DefaultSettingValueAttribute("0.1")]
         public double UpdateTime {
             get {
                 return ((double)(this["UpdateTime"]));
@@ -780,7 +780,7 @@ public double AccentIndentScale {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
         public bool DisperseCommentOffsets {
             get {
                 return ((bool)(this["DisperseCommentOffsets"]));
diff --git a/TwitchDownloaderWPF/Properties/Settings.settings b/TwitchDownloaderWPF/Properties/Settings.settings
index c365cb52..42c4492d 100644
--- a/TwitchDownloaderWPF/Properties/Settings.settings
+++ b/TwitchDownloaderWPF/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">4</Value>
     </Setting>
     <Setting Name="Font" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Arial</Value>
+      <Value Profile="(Default)">Inter Embedded</Value>
     </Setting>
     <Setting Name="FontSize" Type="System.Single" Scope="User">
       <Value Profile="(Default)">24</Value>
@@ -24,7 +24,7 @@
       <Value Profile="(Default)">700</Value>
     </Setting>
     <Setting Name="UpdateTime" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">0.5</Value>
+      <Value Profile="(Default)">0.1</Value>
     </Setting>
     <Setting Name="FFZEmotes" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -192,7 +192,7 @@
       <Value Profile="(Default)">1</Value>
     </Setting>
     <Setting Name="DisperseCommentOffsets" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
+      <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="GuiCulture" Type="System.String" Scope="User">
       <Value Profile="(Default)">en-US</Value>
@@ -222,4 +222,5 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
   </Settings>
-</SettingsFile>
\ No newline at end of file
+</SettingsFile>
+