diff --git a/.gitmodules b/.gitmodules
index c1a2b83f0e..f5c3aeb1bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +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
 [submodule "3rdparty/libchdr/libchdr"]
 	path = 3rdparty/libchdr/libchdr
 	url = https://github.com/rtissera/libchdr.git
@@ -20,3 +17,7 @@
 [submodule "3rdparty/cubeb/cubeb"]
 	path = 3rdparty/cubeb/cubeb
 	url = https://github.com/mozilla/cubeb.git
+[submodule "3rdparty/rapidyaml/rapidyaml"]
+	path = 3rdparty/rapidyaml/rapidyaml
+	url = https://github.com/biojppm/rapidyaml.git
+	branch = master
diff --git a/3rdparty/rapidyaml/rapidyaml b/3rdparty/rapidyaml/rapidyaml
new file mode 160000
index 0000000000..8c70f1e98c
--- /dev/null
+++ b/3rdparty/rapidyaml/rapidyaml
@@ -0,0 +1 @@
+Subproject commit 8c70f1e98c6b6a37ab6df7eb725722132864ea1b
diff --git a/3rdparty/rapidyaml/ryml.vcxproj b/3rdparty/rapidyaml/ryml.vcxproj
new file mode 100644
index 0000000000..57e55169e8
--- /dev/null
+++ b/3rdparty/rapidyaml/ryml.vcxproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
+  <Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DE9653B6-17DD-356A-9EE0-28A731772587}</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>TurnOffAllWarnings</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)/rapidyaml/src;$(ProjectDir)/rapidyaml/ext/c4core/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="$(Configuration.Contains(Debug))">
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="!$(Configuration.Contains(Debug))">
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="rapidyaml\src\ryml.hpp" />
+    <ClInclude Include="rapidyaml\src\ryml_std.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\detail\checks.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\detail\parser_dbg.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\detail\stack.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\common.hpp" />
+    <ClCompile Include="rapidyaml\src\c4\yml\common.cpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\emit.def.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\emit.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\export.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\node.hpp" />
+    <ClCompile Include="rapidyaml\src\c4\yml\node.cpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\parse.hpp" />
+    <ClCompile Include="rapidyaml\src\c4\yml\parse.cpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\preprocess.hpp" />
+    <ClCompile Include="rapidyaml\src\c4\yml\preprocess.cpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\std\map.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\std\std.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\std\string.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\std\vector.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\tree.hpp" />
+    <ClCompile Include="rapidyaml\src\c4\yml\tree.cpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\writer.hpp" />
+    <ClInclude Include="rapidyaml\src\c4\yml\yml.hpp" />
+    <Natvis Include="rapidyaml\src\ryml.natvis">
+    </Natvis>
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\allocator.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\base64.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\base64.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\blob.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\bitmask.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\charconv.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\c4_pop.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\c4_push.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\char_traits.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\char_traits.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\common.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\compiler.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\config.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\cpu.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ctor_dtor.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\enum.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\error.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\error.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\export.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\format.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\format.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\hash.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\language.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\language.cpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\memory_resource.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\memory_resource.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\memory_util.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\memory_util.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\platform.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\preprocessor.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\restrict.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\span.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\std\std.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\std\string.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\std\tuple.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\std\vector.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\substr.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\substr_fwd.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\szconv.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\time.hpp" />
+    <ClCompile Include="rapidyaml\ext\c4core\src\c4\time.cpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\type_name.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\types.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\unrestrict.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\windows.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\windows_pop.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\windows_push.hpp" />
+    <Natvis Include="rapidyaml\ext\c4core\src\c4\c4core.natvis">
+    </Natvis>
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\debugbreak\debugbreak.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\rng\rng.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\sg14\inplace_function.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float.hpp" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\ascii_number.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\bigint.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\decimal_to_binary.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\digit_comparison.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\fast_float.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\fast_table.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\float_common.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\parse_number.h" />
+    <ClInclude Include="rapidyaml\ext\c4core\src\c4\ext\fast_float\include\fast_float\simple_decimal_conversion.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/3rdparty/yaml-cpp/yaml-cpp b/3rdparty/yaml-cpp/yaml-cpp
deleted file mode 160000
index 98acc5a887..0000000000
--- a/3rdparty/yaml-cpp/yaml-cpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98acc5a8874faab28b82c28936f4b400b389f5d6
diff --git a/3rdparty/yaml-cpp/yaml.vcxproj b/3rdparty/yaml-cpp/yaml.vcxproj
deleted file mode 100644
index 0b65a60bfb..0000000000
--- a/3rdparty/yaml-cpp/yaml.vcxproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
-  <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>TurnOffAllWarnings</WarningLevel>
-      <AdditionalIncludeDirectories>$(ProjectDir)/yaml-cpp/include/;$(ProjectDir)/yaml-cpp/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </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