diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp
@@ -16,7 +16,7 @@
 #include "Common/FileUtil.h"
 
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
+#include "Core/Config/UISettings.h"
 
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/Settings/PathPane.h"
@@ -148,7 +148,7 @@ QGroupBox* PathPane::MakeGameFolderBox()
   m_remove_path->setEnabled(false);
 
   auto* recursive_checkbox = new QCheckBox(tr("Search Subfolders"));
-  recursive_checkbox->setChecked(SConfig::GetInstance().m_RecursiveISOFolder);
+  recursive_checkbox->setChecked(Config::Get(Config::MAIN_RECURSIVE_ISO_PATHS));
 
   auto* auto_checkbox = new QCheckBox(tr("Check for Game List Changes in the Background"));
   auto_checkbox->setChecked(Settings::Instance().IsAutoRefreshEnabled());
@@ -160,7 +160,7 @@ QGroupBox* PathPane::MakeGameFolderBox()
   vlayout->addWidget(auto_checkbox);
 
   connect(recursive_checkbox, &QCheckBox::toggled, [](bool checked) {
-    SConfig::GetInstance().m_RecursiveISOFolder = checked;
+    Config::SetBase(Config::MAIN_RECURSIVE_ISO_PATHS, checked);
     Settings::Instance().RefreshGameList();
   });
 

diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
@@ -102,7 +102,7 @@ void Init()
   GCAdapter::Init();
   VideoBackendBase::ActivateBackend(Config::Get(Config::MAIN_GFX_BACKEND));
 
-  Common::SetEnableAlert(SConfig::GetInstance().bUsePanicHandlers);
+  Common::SetEnableAlert(Config::Get(Config::MAIN_USE_PANIC_HANDLERS));
 }
 
 void Shutdown()

diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp
@@ -13,9 +13,10 @@
 #include <imgui.h>
 
 #include "Common/CommonTypes.h"
+#include "Common/Config/Config.h"
 #include "Common/Timer.h"
 
-#include "Core/ConfigManager.h"
+#include "Core/Config/MainSettings.h"
 
 namespace OSD
 {
@@ -94,7 +95,7 @@ void AddMessage(std::string message, u32 ms, u32 argb)
 
 void DrawMessages()
 {
-  const bool draw_messages = SConfig::GetInstance().bOnScreenDisplayMessages;
+  const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES);
   const u32 now = Common::Timer::GetTimeMs();
   const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x;
   float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y;