diff --git a/AngelLoader/AngelLoader.csproj b/AngelLoader/AngelLoader.csproj
index db7afb11c..c4d43caad 100644
--- a/AngelLoader/AngelLoader.csproj
+++ b/AngelLoader/AngelLoader.csproj
@@ -215,23 +215,23 @@
     <Compile Include="CustomControls\RichTextBoxCustom\Workarounds.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\FMDisplayPage.cs">
+    <Compile Include="CustomControls\SettingsPages\FMDisplayPage.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\FMDisplayPage.Designer.cs">
+    <Compile Include="CustomControls\SettingsPages\FMDisplayPage.Designer.cs">
       <DependentUpon>FMDisplayPage.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\Interfaces.cs" />
-    <Compile Include="CustomControls\SettingsForm\OtherPage.cs">
+    <Compile Include="CustomControls\SettingsPages\Interfaces.cs" />
+    <Compile Include="CustomControls\SettingsPages\OtherPage.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\OtherPage.Designer.cs">
+    <Compile Include="CustomControls\SettingsPages\OtherPage.Designer.cs">
       <DependentUpon>OtherPage.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\PathsPage.cs">
+    <Compile Include="CustomControls\SettingsPages\PathsPage.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CustomControls\SettingsForm\PathsPage.Designer.cs">
+    <Compile Include="CustomControls\SettingsPages\PathsPage.Designer.cs">
       <DependentUpon>PathsPage.cs</DependentUpon>
     </Compile>
     <Compile Include="CustomControls\Static_LazyLoaded\AddTagLLMenu.cs" />
@@ -361,13 +361,13 @@
     <EmbeddedResource Include="CustomControls\ProgressPanel.resx">
       <DependentUpon>ProgressPanel.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControls\SettingsForm\FMDisplayPage.resx">
+    <EmbeddedResource Include="CustomControls\SettingsPages\FMDisplayPage.resx">
       <DependentUpon>FMDisplayPage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControls\SettingsForm\OtherPage.resx">
+    <EmbeddedResource Include="CustomControls\SettingsPages\OtherPage.resx">
       <DependentUpon>OtherPage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControls\SettingsForm\PathsPage.resx">
+    <EmbeddedResource Include="CustomControls\SettingsPages\PathsPage.resx">
       <DependentUpon>PathsPage.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FilterRatingForm.resx">
diff --git a/AngelLoader/CustomControls/SettingsForm/FMDisplayPage.Designer.cs b/AngelLoader/CustomControls/SettingsPages/FMDisplayPage.Designer.cs
similarity index 99%
rename from AngelLoader/CustomControls/SettingsForm/FMDisplayPage.Designer.cs
rename to AngelLoader/CustomControls/SettingsPages/FMDisplayPage.Designer.cs
index a8b52f39f..44622baa7 100644
--- a/AngelLoader/CustomControls/SettingsForm/FMDisplayPage.Designer.cs
+++ b/AngelLoader/CustomControls/SettingsPages/FMDisplayPage.Designer.cs
@@ -1,4 +1,4 @@
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     partial class FMDisplayPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/FMDisplayPage.cs b/AngelLoader/CustomControls/SettingsPages/FMDisplayPage.cs
similarity index 92%
rename from AngelLoader/CustomControls/SettingsForm/FMDisplayPage.cs
rename to AngelLoader/CustomControls/SettingsPages/FMDisplayPage.cs
index 20be81ea6..a3db653ce 100644
--- a/AngelLoader/CustomControls/SettingsForm/FMDisplayPage.cs
+++ b/AngelLoader/CustomControls/SettingsPages/FMDisplayPage.cs
@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using AngelLoader.Common.Utility;
 
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     public partial class FMDisplayPage : UserControl, Interfaces.ISettingsPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/FMDisplayPage.resx b/AngelLoader/CustomControls/SettingsPages/FMDisplayPage.resx
similarity index 100%
rename from AngelLoader/CustomControls/SettingsForm/FMDisplayPage.resx
rename to AngelLoader/CustomControls/SettingsPages/FMDisplayPage.resx
diff --git a/AngelLoader/CustomControls/SettingsForm/Interfaces.cs b/AngelLoader/CustomControls/SettingsPages/Interfaces.cs
similarity index 83%
rename from AngelLoader/CustomControls/SettingsForm/Interfaces.cs
rename to AngelLoader/CustomControls/SettingsPages/Interfaces.cs
index e9116b040..d77706f05 100644
--- a/AngelLoader/CustomControls/SettingsForm/Interfaces.cs
+++ b/AngelLoader/CustomControls/SettingsPages/Interfaces.cs
@@ -1,4 +1,4 @@
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     internal class Interfaces
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/OtherPage.Designer.cs b/AngelLoader/CustomControls/SettingsPages/OtherPage.Designer.cs
similarity index 99%
rename from AngelLoader/CustomControls/SettingsForm/OtherPage.Designer.cs
rename to AngelLoader/CustomControls/SettingsPages/OtherPage.Designer.cs
index 3353f6227..40f5b1d29 100644
--- a/AngelLoader/CustomControls/SettingsForm/OtherPage.Designer.cs
+++ b/AngelLoader/CustomControls/SettingsPages/OtherPage.Designer.cs
@@ -1,4 +1,4 @@
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     partial class OtherPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/OtherPage.cs b/AngelLoader/CustomControls/SettingsPages/OtherPage.cs
similarity index 92%
rename from AngelLoader/CustomControls/SettingsForm/OtherPage.cs
rename to AngelLoader/CustomControls/SettingsPages/OtherPage.cs
index cb7fb1420..80cf3ed3b 100644
--- a/AngelLoader/CustomControls/SettingsForm/OtherPage.cs
+++ b/AngelLoader/CustomControls/SettingsPages/OtherPage.cs
@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using AngelLoader.Common.Utility;
 
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     public partial class OtherPage : UserControl, Interfaces.ISettingsPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/OtherPage.resx b/AngelLoader/CustomControls/SettingsPages/OtherPage.resx
similarity index 100%
rename from AngelLoader/CustomControls/SettingsForm/OtherPage.resx
rename to AngelLoader/CustomControls/SettingsPages/OtherPage.resx
diff --git a/AngelLoader/CustomControls/SettingsForm/PathsPage.Designer.cs b/AngelLoader/CustomControls/SettingsPages/PathsPage.Designer.cs
similarity index 99%
rename from AngelLoader/CustomControls/SettingsForm/PathsPage.Designer.cs
rename to AngelLoader/CustomControls/SettingsPages/PathsPage.Designer.cs
index 05474d08f..12275755b 100644
--- a/AngelLoader/CustomControls/SettingsForm/PathsPage.Designer.cs
+++ b/AngelLoader/CustomControls/SettingsPages/PathsPage.Designer.cs
@@ -1,4 +1,4 @@
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     partial class PathsPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/PathsPage.cs b/AngelLoader/CustomControls/SettingsPages/PathsPage.cs
similarity index 92%
rename from AngelLoader/CustomControls/SettingsForm/PathsPage.cs
rename to AngelLoader/CustomControls/SettingsPages/PathsPage.cs
index fbb0afbf2..25b538315 100644
--- a/AngelLoader/CustomControls/SettingsForm/PathsPage.cs
+++ b/AngelLoader/CustomControls/SettingsPages/PathsPage.cs
@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using AngelLoader.Common.Utility;
 
-namespace AngelLoader.CustomControls.SettingsForm
+namespace AngelLoader.CustomControls.SettingsPages
 {
     public partial class PathsPage : UserControl, Interfaces.ISettingsPage
     {
diff --git a/AngelLoader/CustomControls/SettingsForm/PathsPage.resx b/AngelLoader/CustomControls/SettingsPages/PathsPage.resx
similarity index 100%
rename from AngelLoader/CustomControls/SettingsForm/PathsPage.resx
rename to AngelLoader/CustomControls/SettingsPages/PathsPage.resx
diff --git a/AngelLoader/Forms/MainForm.cs b/AngelLoader/Forms/MainForm.cs
index e7ada1cd5..9312a7519 100644
--- a/AngelLoader/Forms/MainForm.cs
+++ b/AngelLoader/Forms/MainForm.cs
@@ -2777,6 +2777,9 @@ private async Task DisplaySelectedFM(bool refreshReadme = false)
 
             using (new DisableEvents(this)) ChooseReadmeComboBox.ClearFullItems();
 
+            // Debug
+            fm.SelectedReadme = "";
+
             if (!fm.SelectedReadme.IsEmpty())
             {
                 if (readmeFiles.Count > 1)
@@ -2805,6 +2808,9 @@ private async Task DisplaySelectedFM(bool refreshReadme = false)
                 {
                     var safeReadme = Core.DetectSafeReadme(readmeFiles, fm.Title);
 
+                    // Debug
+                    safeReadme = "";
+
                     if (!safeReadme.IsEmpty())
                     {
                         fm.SelectedReadme = safeReadme;
diff --git a/AngelLoader/Forms/MainForm_InitManual.cs b/AngelLoader/Forms/MainForm_InitManual.cs
index ee25e5446..83e6137c0 100644
--- a/AngelLoader/Forms/MainForm_InitManual.cs
+++ b/AngelLoader/Forms/MainForm_InitManual.cs
@@ -1674,11 +1674,7 @@ private void InitComponentManual()
             // 
             // ChooseReadmePanel
             // 
-            // PERF_TODO: AutoSizeMode is GrowAndShrink, so can we get rid of the size set?
-            // Should it even be autosizing at all...? (I don't think so?!)
             ChooseReadmePanel.Anchor = AnchorStyles.None;
-            ChooseReadmePanel.AutoSize = true;
-            ChooseReadmePanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             ChooseReadmePanel.Controls.Add(ChooseReadmeOKFLP);
             ChooseReadmePanel.Controls.Add(ChooseReadmeListBox);
             // This gets centered later so no location is specified here
@@ -1698,7 +1694,6 @@ private void InitComponentManual()
             // 
             ChooseReadmeButton.Anchor = AnchorStyles.Top | AnchorStyles.Right;
             ChooseReadmeButton.AutoSize = true;
-            ChooseReadmeButton.Location = new Point(245, 0);
             ChooseReadmeButton.Margin = new Padding(0);
             ChooseReadmeButton.Padding = new Padding(6, 0, 6, 0);
             ChooseReadmeButton.Height = 23;
@@ -1709,7 +1704,6 @@ private void InitComponentManual()
             // ChooseReadmeListBox
             // 
             ChooseReadmeListBox.FormattingEnabled = true;
-            ChooseReadmeListBox.Location = new Point(0, 0);
             ChooseReadmeListBox.Size = new Size(320, 134);
             ChooseReadmeListBox.TabIndex = 47;
             // 
diff --git a/AngelLoader/Forms/SettingsForm.cs b/AngelLoader/Forms/SettingsForm.cs
index d31452511..19fdabbdb 100644
--- a/AngelLoader/Forms/SettingsForm.cs
+++ b/AngelLoader/Forms/SettingsForm.cs
@@ -11,11 +11,11 @@
 using AngelLoader.Common.DataClasses;
 using AngelLoader.Common.Utility;
 using AngelLoader.CustomControls;
-using AngelLoader.CustomControls.SettingsForm;
+using AngelLoader.CustomControls.SettingsPages;
 using AngelLoader.Properties;
 using AngelLoader.WinAPI.Dialogs;
 using static AngelLoader.Common.Logger;
-using static AngelLoader.CustomControls.SettingsForm.Interfaces;
+using static AngelLoader.CustomControls.SettingsPages.Interfaces;
 
 namespace AngelLoader.Forms
 {