diff --git a/.github/workflows/linux-workflow.yml b/.github/workflows/linux-workflow.yml
index c8fe1a7d49..441b563aba 100644
--- a/.github/workflows/linux-workflow.yml
+++ b/.github/workflows/linux-workflow.yml
@@ -85,6 +85,7 @@ jobs:
             ./.git/modules/
             ./3rdparty/fmt
             ./3rdparty/xz
+            ./3rdparty/yaml-cpp
             ./3rdparty/gtest
 
       - name: Checkout Submodules
diff --git a/.github/workflows/windows-workflow.yml b/.github/workflows/windows-workflow.yml
index 243641ffa0..d943807128 100644
--- a/.github/workflows/windows-workflow.yml
+++ b/.github/workflows/windows-workflow.yml
@@ -66,6 +66,7 @@ jobs:
             ./.git/modules/
             ./3rdparty/fmt
             ./3rdparty/xz
+            ./3rdparty/yaml-cpp
             ./3rdparty/gtest
 
       - name: Checkout Submodules
diff --git a/.gitmodules b/.gitmodules
index 17e9711d93..b336aa2b43 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "3rdparty/fmt/fmt"]
 	path = 3rdparty/fmt/fmt
 	url = https://github.com/fmtlib/fmt.git
+[submodule "3rdparty/yaml-cpp/yaml-cpp"]
+	path = 3rdparty/yaml-cpp/yaml-cpp
+	url = https://github.com/jbeder/yaml-cpp.git
diff --git a/3rdparty/yaml-cpp/yaml-cpp b/3rdparty/yaml-cpp/yaml-cpp
new file mode 160000
index 0000000000..98acc5a887
--- /dev/null
+++ b/3rdparty/yaml-cpp/yaml-cpp
@@ -0,0 +1 @@
+Subproject commit 98acc5a8874faab28b82c28936f4b400b389f5d6
diff --git a/3rdparty/yaml-cpp/yaml.vcxproj b/3rdparty/yaml-cpp/yaml.vcxproj
new file mode 100644
index 0000000000..ecee74f2be
--- /dev/null
+++ b/3rdparty/yaml-cpp/yaml.vcxproj
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Devel|Win32">
+      <Configuration>Devel</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Devel|x64">
+      <Configuration>Devel</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{48329442-E41B-4A1F-8364-36EEE1B71343}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
+    <UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
+    <UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\DefaultProjectRootDir.props" />
+    <Import Project="..\3rdparty.props" />
+    <Import Condition="$(Configuration.Contains(Debug))" Project="..\..\common\vsprops\CodeGen_Debug.props" />
+    <Import Condition="$(Configuration.Contains(Devel))" Project="..\..\common\vsprops\CodeGen_Devel.props" />
+    <Import Condition="$(Configuration.Contains(Release))" Project="..\..\common\vsprops\CodeGen_Release.props" />
+    <Import Condition="!$(Configuration.Contains(Release))" Project="..\..\common\vsprops\IncrementalLinking.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)/yaml-cpp/include/;$(ProjectDir)/yaml-cpp/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Speed</FavorSizeOrSpeed>
+      <OmitFramePointers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</OmitFramePointers>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="yaml-cpp\src\contrib\graphbuilder.cpp" />
+    <ClCompile Include="yaml-cpp\src\contrib\graphbuilderadapter.cpp" />
+    <ClCompile Include="yaml-cpp\src\binary.cpp" />
+    <ClCompile Include="yaml-cpp\src\convert.cpp" />
+    <ClCompile Include="yaml-cpp\src\depthguard.cpp" />
+    <ClCompile Include="yaml-cpp\src\directives.cpp" />
+    <ClCompile Include="yaml-cpp\src\emit.cpp" />
+    <ClCompile Include="yaml-cpp\src\emitfromevents.cpp" />
+    <ClCompile Include="yaml-cpp\src\emitter.cpp" />
+    <ClCompile Include="yaml-cpp\src\emitterstate.cpp" />
+    <ClCompile Include="yaml-cpp\src\emitterutils.cpp" />
+    <ClCompile Include="yaml-cpp\src\exceptions.cpp" />
+    <ClCompile Include="yaml-cpp\src\exp.cpp" />
+    <ClCompile Include="yaml-cpp\src\memory.cpp" />
+    <ClCompile Include="yaml-cpp\src\node.cpp" />
+    <ClCompile Include="yaml-cpp\src\node_data.cpp" />
+    <ClCompile Include="yaml-cpp\src\nodebuilder.cpp" />
+    <ClCompile Include="yaml-cpp\src\nodeevents.cpp" />
+    <ClCompile Include="yaml-cpp\src\null.cpp" />
+    <ClCompile Include="yaml-cpp\src\ostream_wrapper.cpp" />
+    <ClCompile Include="yaml-cpp\src\parse.cpp" />
+    <ClCompile Include="yaml-cpp\src\parser.cpp" />
+    <ClCompile Include="yaml-cpp\src\regex_yaml.cpp" />
+    <ClCompile Include="yaml-cpp\src\scanner.cpp" />
+    <ClCompile Include="yaml-cpp\src\scanscalar.cpp" />
+    <ClCompile Include="yaml-cpp\src\scantag.cpp" />
+    <ClCompile Include="yaml-cpp\src\scantoken.cpp" />
+    <ClCompile Include="yaml-cpp\src\simplekey.cpp" />
+    <ClCompile Include="yaml-cpp\src\singledocparser.cpp" />
+    <ClCompile Include="yaml-cpp\src\stream.cpp" />
+    <ClCompile Include="yaml-cpp\src\tag.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln
index e9b5647f56..85553e88e5 100644
--- a/PCSX2_suite.sln
+++ b/PCSX2_suite.sln
@@ -74,6 +74,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "3rdparty\fmt\fmt.vcx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "3rdparty\libsamplerate\libsamplerate.vcxproj", "{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml", "3rdparty\yaml-cpp\yaml.vcxproj", "{48329442-E41B-4A1F-8364-36EEE1B71343}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -508,6 +510,26 @@ Global
 		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|Win32.Build.0 = Release|Win32
 		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.ActiveCfg = Release|x64
 		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.Build.0 = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Debug|Win32.Build.0 = Debug|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Debug|x64.ActiveCfg = Debug|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Debug|x64.Build.0 = Debug|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Devel|Win32.ActiveCfg = Devel|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Devel|Win32.Build.0 = Devel|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Devel|x64.ActiveCfg = Devel|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Devel|x64.Build.0 = Devel|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release AVX2|Win32.ActiveCfg = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release AVX2|Win32.Build.0 = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release AVX2|x64.ActiveCfg = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release AVX2|x64.Build.0 = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release SSE4|Win32.ActiveCfg = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release SSE4|Win32.Build.0 = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release SSE4|x64.ActiveCfg = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release SSE4|x64.Build.0 = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release|Win32.ActiveCfg = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release|Win32.Build.0 = Release|Win32
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release|x64.ActiveCfg = Release|x64
+		{48329442-E41B-4A1F-8364-36EEE1B71343}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -535,6 +557,7 @@ Global
 		{12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{449AD25E-424A-4714-BABC-68706CDCC33B} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
+		{48329442-E41B-4A1F-8364-36EEE1B71343} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77}
diff --git a/common/vsprops/3rdpartyDeps.props b/common/vsprops/3rdpartyDeps.props
index 41276724a3..28a00d8a68 100644
--- a/common/vsprops/3rdpartyDeps.props
+++ b/common/vsprops/3rdpartyDeps.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SvnRootDir)\3rdparty\;$(SvnRootDir)\3rdparty\soundtouch\;$(SolutionDir)\3rdparty\fmt\fmt\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SvnRootDir)\3rdparty\;$(SvnRootDir)\3rdparty\soundtouch\;$(SolutionDir)\3rdparty\yaml-cpp\yaml-cpp\include\;$(SolutionDir)\3rdparty\fmt\fmt\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index 993a193964..14cf7251dd 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -883,6 +883,9 @@
     <ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj">
       <Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\3rdparty\yaml-cpp\yaml.vcxproj">
+      <Project>{48329442-e41b-4a1f-8364-36eee1b71343}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\3rdparty\zlib\zlib.vcxproj">
       <Project>{2f6c0388-20cb-4242-9f6c-a6ebb6a83f47}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>