diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml
index b7c61fe5..9ce44eaf 100644
--- a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml
@@ -273,51 +273,67 @@
 							Label="Custom File Naming">
 
 							<Grid
-								RowDefinitions="Auto,Auto,Auto,Auto"
+								RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
 								ColumnDefinitions="*,Auto">
 
-								<TextBox
+								<TextBlock
 									Grid.Row="0"
 									Grid.Column="0"
-									Margin="0,10,10,10"
+									Margin="0,5,0,0"
+									Text="{Binding DownloadDecryptSettings.FolderTemplateText}" />
+								
+								<TextBox
+									Grid.Row="1"
+									Grid.Column="0"
+									Margin="0,5,10,10"
 									FontSize="14"
 									IsReadOnly="True"
 									Text="{Binding DownloadDecryptSettings.FolderTemplate}" />
 
 								<Button
-									Grid.Row="0"
+									Grid.Row="1"
 									Grid.Column="1"
 									Content="Edit"
 									Height="30"
 									Padding="30,3,30,3"
 									Click="EditFolderTemplateButton_Click" />
 
-								<TextBox
-									Grid.Row="1"
+								<TextBlock
+									Grid.Row="2"
 									Grid.Column="0"
-									Margin="0,10,10,10"
+									Text="{Binding DownloadDecryptSettings.FileTemplateText}" />
+
+								<TextBox
+									Grid.Row="3"
+									Grid.Column="0"
+									Margin="0,5,10,10"
 									FontSize="14"
 									IsReadOnly="True"
 									Text="{Binding DownloadDecryptSettings.FileTemplate}" />
 
 								<Button
-									Grid.Row="1"
+									Grid.Row="3"
 									Grid.Column="1"
 									Content="Edit"
 									Height="30"
 									Padding="30,3,30,3"
 									Click="EditFileTemplateButton_Click" />
 
-								<TextBox
-									Grid.Row="2"
+								<TextBlock
+									Grid.Row="4"
 									Grid.Column="0"
-									Margin="0,10,10,10"
+									Text="{Binding DownloadDecryptSettings.ChapterFileTemplateText}" />
+
+								<TextBox
+									Grid.Row="5"
+									Grid.Column="0"
+									Margin="0,5,10,10"
 									FontSize="14"
 									IsReadOnly="True"
 									Text="{Binding DownloadDecryptSettings.ChapterFileTemplate}" />
 
 								<Button
-									Grid.Row="2"
+									Grid.Row="5"
 									Grid.Column="1"
 									Content="Edit"
 									Height="30"
@@ -325,7 +341,7 @@
 									Click="EditChapterFileTemplateButton_Click" />
 
 								<Button
-									Grid.Row="3"
+									Grid.Row="6"
 									Grid.Column="0"
 									Content="{Binding DownloadDecryptSettings.EditCharReplacementText}"
 									Height="30"