diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
index 096a1fdbb4..4dce34147e 100644
--- a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
@@ -10,7 +10,7 @@
 #include "CommonFramework/Logging/Logger.h"
 //#include "CommonFramework/PersistentSettings.h"
 #include "CommonFramework/Panels/PanelTools.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/NintendoSwitch_SettingsPanel.h"
 #include "NintendoSwitch_ControllerSettings.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
index 1eff71b749..4fd719f779 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
@@ -8,7 +8,7 @@
 #include "CommonFramework/GlobalAutoPaths.h"
 #include "NintendoSwitch_Panels.h"
 
-#include "NintendoSwitch_Settings.h"
+#include "NintendoSwitch_SettingsPanel.h"
 
 #include "Programs/NintendoSwitch_VirtualConsole.h"
 #include "Programs/NintendoSwitch_SwitchViewer.h"
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
index 96adbcf71e..3e60ada3f1 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
@@ -194,22 +194,6 @@ void ConsoleSettings::load_json(const JsonValue& json){
 }
 
 
-ConsoleSettings_Descriptor::ConsoleSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "NintendoSwitch:GlobalSettings",
-        "Nintendo Switch", "Framework Settings",
-        "Programs/NintendoSwitch/FrameworkSettings.html",
-        "Switch Framework Settings"
-    )
-{}
-
-ConsoleSettingsPanel::ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(ConsoleSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
index ef2c1cc4a7..a7517f41fb 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
@@ -11,7 +11,7 @@
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/TimeDurationOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
+// #include "CommonFramework/Panels/SettingsPanel.h"
 #include "Options/NintendoSwitch_CodeEntrySettingsOption.h"
 #include "Controllers/NintendoSwitch_ControllerSettings.h"
 #include "Controllers/NintendoSwitch_KeyboardMapping.h"
@@ -76,18 +76,6 @@ class ConsoleSettings : public BatchOption{
 
 
 
-class ConsoleSettings_Descriptor : public PanelDescriptor{
-public:
-    ConsoleSettings_Descriptor();
-};
-
-
-class ConsoleSettingsPanel : public SettingsPanelInstance{
-public:
-    ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor);
-private:
-    ConsoleSettings& settings;
-};
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
new file mode 100644
index 0000000000..5c34a1db1a
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
@@ -0,0 +1,44 @@
+/*  Nintendo Switch Settings Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch_SettingsPanel.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+ConsoleSettings_Descriptor::ConsoleSettings_Descriptor()
+    : PanelDescriptor(
+        Color(),
+        "NintendoSwitch:GlobalSettings",
+        "Nintendo Switch", "Framework Settings",
+        "Programs/NintendoSwitch/FrameworkSettings.html",
+        "Switch Framework Settings"
+    )
+{}
+
+ConsoleSettingsPanel::ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor)
+    : SettingsPanelInstance(descriptor)
+    , settings(ConsoleSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
new file mode 100644
index 0000000000..4bc37018d2
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
@@ -0,0 +1,38 @@
+/*  Nintendo Switch Settings Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_SettingsPanel_H
+#define PokemonAutomation_NintendoSwitch_SettingsPanel_H
+
+
+#include "NintendoSwitch_Settings.h"
+#include "CommonFramework/Panels/SettingsPanel.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class ConsoleSettings_Descriptor : public PanelDescriptor{
+public:
+    ConsoleSettings_Descriptor();
+};
+
+
+class ConsoleSettingsPanel : public SettingsPanelInstance{
+public:
+    ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor);
+private:
+    ConsoleSettings& settings;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake
index 2d3cfe3cf5..f6e816b3b2 100644
--- a/SerialPrograms/cmake/SourceFiles.cmake
+++ b/SerialPrograms/cmake/SourceFiles.cmake
@@ -1229,6 +1229,8 @@ file(GLOB LIBRARY_SOURCES
     Source/NintendoSwitch/NintendoSwitch_Panels.h
     Source/NintendoSwitch/NintendoSwitch_Settings.cpp
     Source/NintendoSwitch/NintendoSwitch_Settings.h
+    Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
+    Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
     Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
     Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
     Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp