diff --git a/.gitmodules b/.gitmodules
index d13bcc84cd..bc14f5ecb5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,3 +32,6 @@
 	url = https://github.com/randy408/libspng.git
 	branch = v0.7.2
 	shallow = true
+[submodule "Externals/Qt"]
+	path = Externals/Qt
+	url = https://github.com/dolphin-emu/ext-win-qt.git
diff --git a/Externals/imgui/imgui.vcxproj b/Externals/imgui/imgui.vcxproj
index bcbd4d0766..9a712b2c26 100644
--- a/Externals/imgui/imgui.vcxproj
+++ b/Externals/imgui/imgui.vcxproj
@@ -19,6 +19,7 @@
     <ClCompile>
       <!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
       <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/Externals/mGBA/mgba.vcxproj b/Externals/mGBA/mgba.vcxproj
index 56112ae8b6..39a1786477 100644
--- a/Externals/mGBA/mgba.vcxproj
+++ b/Externals/mGBA/mgba.vcxproj
@@ -18,7 +18,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>mgba\include;mgba\src;mgba\src\third-party\lzma;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;DISABLE_THREADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PreBuildEvent>
       <Command>"$(CScript)" /nologo /E:JScript "make_version.c.js"</Command>
diff --git a/Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp b/Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp
index 92eaf84db2..a796a2ebcb 100644
--- a/Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp
+++ b/Source/Core/Core/PrimeHack/Mods/STRGPatch.cpp
@@ -5,7 +5,8 @@ namespace prime {
 namespace {
 std::string readin_str(u32 str_ptr) {
   std::ostringstream key_readin;
-  for (char c; (c = read8(str_ptr)); str_ptr++) {
+
+  for (char c = read8(str_ptr); c; c = read8(++str_ptr)) {
     key_readin << c;
   }
   return key_readin.str();
@@ -77,7 +78,7 @@ void STRGPatch::run_mod(Game game, Region region) {
 void STRGPatch::run_mod_mp3() {
   char str[] = "&just=center;Mash Jump [&image=0x5FC17B1F30BAA7AE;] to shake off Gandrayda!";
   for (size_t i = 0; i < sizeof(str); i++) {
-    write8(str[i], replace_string_addr + i);
+    write8(str[i], replace_string_addr + static_cast<u32>(i));
   }
 }
 
diff --git a/Source/Core/DolphinLib.vcxproj b/Source/Core/DolphinLib.vcxproj
index 7ec9410083..d8b762512e 100644
--- a/Source/Core/DolphinLib.vcxproj
+++ b/Source/Core/DolphinLib.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="Core\PrimeHack\Mods\PortalSkipMP2.cpp" />
     <ClCompile Include="Core\PrimeHack\Mods\BloomIntensityMP3.cpp" />
     <ClCompile Include="Core\PrimeHack\Mods\SpringballButton.cpp" />
+    <ClCompile Include="Core\PrimeHack\Mods\STRGPatch.cpp" />
     <ClCompile Include="Core\PrimeHack\Mods\ViewModifier.cpp" />
     <ClCompile Include="Core\PrimeHack\PrimeMod.cpp" />
     <ClCompile Include="Core\PrimeHack\PrimeUtils.cpp" />
@@ -83,6 +84,7 @@
     <ClInclude Include="Core\PrimeHack\Mods\RestoreDashing.h" />
     <ClInclude Include="Core\PrimeHack\Mods\SkipCutscene.h" />
     <ClInclude Include="Core\PrimeHack\Mods\SpringballButton.h" />
+    <ClInclude Include="Core\PrimeHack\Mods\STRGPatch.h" />
     <ClInclude Include="Core\PrimeHack\Mods\ViewModifier.h" />
     <ClInclude Include="Core\PrimeHack\PrimeMod.h" />
     <ClInclude Include="Core\PrimeHack\PrimeUtils.h" />
@@ -126,4 +128,4 @@
   <Import Project="$(ExternalsDir)zstd\exports.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinQt/Config/PrimeCheatsWidget.cpp b/Source/Core/DolphinQt/Config/PrimeCheatsWidget.cpp
index 0d318332e3..72b549c5b8 100644
--- a/Source/Core/DolphinQt/Config/PrimeCheatsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/PrimeCheatsWidget.cpp
@@ -119,8 +119,3 @@ void PrimeCheatsWidget::showEvent(QShowEvent*)
 {
   OnLoadConfig();
 }
-
-void PrimeCheatsWidget::enterEvent(QEvent*)
-{
-  OnLoadConfig();
-}
diff --git a/Source/Core/DolphinQt/Config/PrimeCheatsWidget.h b/Source/Core/DolphinQt/Config/PrimeCheatsWidget.h
index 37cbad43b5..3626e4979b 100644
--- a/Source/Core/DolphinQt/Config/PrimeCheatsWidget.h
+++ b/Source/Core/DolphinQt/Config/PrimeCheatsWidget.h
@@ -9,7 +9,6 @@ class PrimeCheatsWidget : public QWidget
 public:
   explicit PrimeCheatsWidget();
 protected:
-  void enterEvent(QEvent*);
   void showEvent(QShowEvent*);
 private:
   void CreateWidgets();
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index 4cd6a537c6..8d92201a75 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -31,15 +31,14 @@
       <AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
       <!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
       <PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-
       <!--Jump through some hoops to generate a pch file local to this project-->
       <AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
     </ClCompile>
     <Manifest>
       <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp
index e19d2a8dd6..dfa07187d2 100644
--- a/Source/Core/DolphinQt/RenderWidget.cpp
+++ b/Source/Core/DolphinQt/RenderWidget.cpp
@@ -543,8 +543,8 @@ void RenderWidget::PassEventToImGui(const QEvent* event)
 
     if (Config::Get(Config::PRIMEHACK_ENABLE))
     {
-      int x = static_cast<const QMouseEvent*>(event)->x();
-      int y = static_cast<const QMouseEvent*>(event)->y();
+      int x = static_cast<const QMouseEvent*>(event)->position().x();
+      int y = static_cast<const QMouseEvent*>(event)->position().y();
 
       prime::g_mouse_input->mousePressEvent(x, y);
     }