diff --git a/Externals/fmt/CONTRIBUTING.md b/Externals/fmt/CONTRIBUTING.md
diff --git a/Externals/fmt/ChangeLog.rst b/Externals/fmt/ChangeLog.rst
diff --git a/Externals/fmt/LICENSE.rst b/Externals/fmt/LICENSE.rst
diff --git a/Externals/fmt/README.rst b/Externals/fmt/README.rst
diff --git a/Externals/fmt/exports.props b/Externals/fmt/exports.props
@@ -2,7 +2,7 @@
 <Project>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)fmt\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/Externals/fmt/fmt b/Externals/fmt/fmt
diff --git a/Externals/fmt/fmt.vcxproj b/Externals/fmt/fmt.vcxproj
@@ -17,27 +17,27 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src/format.cc" />
-    <ClCompile Include="src/os.cc" />
+    <ClCompile Include="fmt/src/format.cc" />
+    <ClCompile Include="fmt/src/os.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include/fmt/args.h" />
-    <ClInclude Include="include/fmt/chrono.h" />
-    <ClInclude Include="include/fmt/color.h" />
-    <ClInclude Include="include/fmt/compile.h" />
-    <ClInclude Include="include/fmt/core.h" />
-    <ClInclude Include="include/fmt/format-inl.h" />
-    <ClInclude Include="include/fmt/format.h" />
-    <ClInclude Include="include/fmt/os.h" />
-    <ClInclude Include="include/fmt/ostream.h" />
-    <ClInclude Include="include/fmt/printf.h" />
-    <ClInclude Include="include/fmt/ranges.h" />
-    <ClInclude Include="include/fmt/std.h" />
-    <ClInclude Include="include/fmt/xchar.h" />
+    <ClInclude Include="fmt/include/fmt/args.h" />
+    <ClInclude Include="fmt/include/fmt/chrono.h" />
+    <ClInclude Include="fmt/include/fmt/color.h" />
+    <ClInclude Include="fmt/include/fmt/compile.h" />
+    <ClInclude Include="fmt/include/fmt/core.h" />
+    <ClInclude Include="fmt/include/fmt/format-inl.h" />
+    <ClInclude Include="fmt/include/fmt/format.h" />
+    <ClInclude Include="fmt/include/fmt/os.h" />
+    <ClInclude Include="fmt/include/fmt/ostream.h" />
+    <ClInclude Include="fmt/include/fmt/printf.h" />
+    <ClInclude Include="fmt/include/fmt/ranges.h" />
+    <ClInclude Include="fmt/include/fmt/std.h" />
+    <ClInclude Include="fmt/include/fmt/xchar.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Externals/fmt/include/fmt/args.h b/Externals/fmt/include/fmt/args.h
diff --git a/Externals/fmt/include/fmt/chrono.h b/Externals/fmt/include/fmt/chrono.h
diff --git a/Externals/fmt/include/fmt/color.h b/Externals/fmt/include/fmt/color.h
diff --git a/Externals/fmt/include/fmt/compile.h b/Externals/fmt/include/fmt/compile.h
diff --git a/Externals/fmt/include/fmt/core.h b/Externals/fmt/include/fmt/core.h
diff --git a/Externals/fmt/include/fmt/format-inl.h b/Externals/fmt/include/fmt/format-inl.h
diff --git a/Externals/fmt/include/fmt/format.h b/Externals/fmt/include/fmt/format.h
diff --git a/Externals/fmt/include/fmt/os.h b/Externals/fmt/include/fmt/os.h
diff --git a/Externals/fmt/include/fmt/ostream.h b/Externals/fmt/include/fmt/ostream.h
diff --git a/Externals/fmt/include/fmt/printf.h b/Externals/fmt/include/fmt/printf.h
diff --git a/Externals/fmt/include/fmt/ranges.h b/Externals/fmt/include/fmt/ranges.h
diff --git a/Externals/fmt/include/fmt/std.h b/Externals/fmt/include/fmt/std.h
diff --git a/Externals/fmt/include/fmt/xchar.h b/Externals/fmt/include/fmt/xchar.h
diff --git a/Externals/fmt/src/fmt.cc b/Externals/fmt/src/fmt.cc
diff --git a/Externals/fmt/src/format.cc b/Externals/fmt/src/format.cc
diff --git a/Externals/fmt/src/os.cc b/Externals/fmt/src/os.cc
diff --git a/Externals/fmt/support/Android.mk b/Externals/fmt/support/Android.mk
diff --git a/Externals/fmt/support/AndroidManifest.xml b/Externals/fmt/support/AndroidManifest.xml
diff --git a/Externals/fmt/support/C++.sublime-syntax b/Externals/fmt/support/C++.sublime-syntax
diff --git a/Externals/fmt/support/README b/Externals/fmt/support/README
diff --git a/Externals/fmt/support/Vagrantfile b/Externals/fmt/support/Vagrantfile
diff --git a/Externals/fmt/support/bazel/.bazelrc b/Externals/fmt/support/bazel/.bazelrc
diff --git a/Externals/fmt/support/bazel/.bazelversion b/Externals/fmt/support/bazel/.bazelversion
diff --git a/Externals/fmt/support/bazel/BUILD.bazel b/Externals/fmt/support/bazel/BUILD.bazel
diff --git a/Externals/fmt/support/bazel/README.md b/Externals/fmt/support/bazel/README.md
diff --git a/Externals/fmt/support/bazel/WORKSPACE.bazel b/Externals/fmt/support/bazel/WORKSPACE.bazel
diff --git a/Externals/fmt/support/build-docs.py b/Externals/fmt/support/build-docs.py
diff --git a/Externals/fmt/support/build.gradle b/Externals/fmt/support/build.gradle
diff --git a/Externals/fmt/support/cmake/FindSetEnv.cmake b/Externals/fmt/support/cmake/FindSetEnv.cmake
diff --git a/Externals/fmt/support/cmake/JoinPaths.cmake b/Externals/fmt/support/cmake/JoinPaths.cmake
diff --git a/Externals/fmt/support/cmake/cxx14.cmake b/Externals/fmt/support/cmake/cxx14.cmake
diff --git a/Externals/fmt/support/cmake/fmt-config.cmake.in b/Externals/fmt/support/cmake/fmt-config.cmake.in
diff --git a/Externals/fmt/support/cmake/fmt.pc.in b/Externals/fmt/support/cmake/fmt.pc.in
diff --git a/Externals/fmt/support/compute-powers.py b/Externals/fmt/support/compute-powers.py
diff --git a/Externals/fmt/support/docopt.py b/Externals/fmt/support/docopt.py
diff --git a/Externals/fmt/support/manage.py b/Externals/fmt/support/manage.py
diff --git a/Externals/fmt/support/printable.py b/Externals/fmt/support/printable.py
diff --git a/Externals/fmt/support/rst2md.py b/Externals/fmt/support/rst2md.py
diff --git a/Externals/fmt/support/rtd/conf.py b/Externals/fmt/support/rtd/conf.py
diff --git a/Externals/fmt/support/rtd/index.rst b/Externals/fmt/support/rtd/index.rst
diff --git a/Externals/fmt/support/rtd/theme/layout.html b/Externals/fmt/support/rtd/theme/layout.html
diff --git a/Externals/fmt/support/rtd/theme/theme.conf b/Externals/fmt/support/rtd/theme/theme.conf
diff --git a/Source/Android/jni/GpuDriver.cpp b/Source/Android/jni/GpuDriver.cpp
@@ -7,6 +7,7 @@
 
 #include <jni.h>
 
+#include "Common/EnumUtils.h"`
 #include "Common/IniFile.h"
 #include "jni/AndroidCommon/AndroidCommon.h"
 #include "jni/AndroidCommon/IDCache.h"
@@ -69,7 +70,7 @@ Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_getSystemDri
     properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
     properties2.pNext = &driverProperties;
     vkGetPhysicalDeviceProperties2(gpu_list.front(), &properties2);
-    driverId = fmt::format("{}", driverProperties.driverID);
+    driverId = fmt::format("{}", Common::ToUnderlying(driverProperties.driverID));
   }
   else
   {

diff --git a/Source/Core/Common/HRWrap.cpp b/Source/Core/Common/HRWrap.cpp
@@ -3,13 +3,15 @@
 
 #include "HRWrap.h"
 
-#include <winrt/base.h>
-
 namespace Common
 {
 std::string GetHResultMessage(HRESULT hr)
 {
   auto err = winrt::hresult_error(hr);
   return winrt::to_string(err.message());
 }
+std::string GetHResultMessage(const winrt::hresult& hr)
+{
+  return GetHResultMessage(hr.value);
+}
 }  // namespace Common
diff --git a/Source/Core/Common/HRWrap.h b/Source/Core/Common/HRWrap.h
@@ -6,6 +6,7 @@
 #include <fmt/format.h>
 #include <string>
 #include <winerror.h>
+#include <winrt/base.h>
 
 #include "Common/CommonTypes.h"
 
@@ -33,3 +34,14 @@ struct fmt::formatter<Common::HRWrap>
                           static_cast<u32>(hr.m_hr));
   }
 };
+
+template <>
+struct fmt::formatter<winrt::hresult>
+{
+  constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
+  template <typename FormatContext>
+  auto format(const winrt::hresult& hr, FormatContext& ctx) const
+  {
+    return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr), hr.value);
+  }
+};
diff --git a/Source/Core/Common/Swap.h b/Source/Core/Common/Swap.h
@@ -16,6 +16,8 @@
 #include <endian.h>
 #endif
 
+#include <fmt/format.h>
+
 #include "Common/CommonTypes.h"
 
 namespace Common
@@ -183,3 +185,15 @@ struct BigEndianValue
   value_type raw;
 };
 }  // Namespace Common
+
+template <typename value_type>
+struct fmt::formatter<Common::BigEndianValue<value_type>>
+{
+  fmt::formatter<value_type> m_formatter;
+  constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); }
+  template <typename FormatContext>
+  auto format(const Common::BigEndianValue<value_type>& value, FormatContext& ctx) const
+  {
+    return m_formatter.format(value.operator value_type(), ctx);
+  }
+};
diff --git a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
@@ -23,6 +23,7 @@
 
 #include <fmt/format.h>
 
+#include "Common/HRWrap.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
@@ -506,7 +507,7 @@ class Device : public Core::Device
     catch (winrt::hresult_error error)
     {
       ERROR_LOG_FMT(CONTROLLERINTERFACE,
-                    "WGInput: IRawGameController::GetCurrentReading failed: {:x}", error.code());
+                    "WGInput: IRawGameController::GetCurrentReading failed: {}", error.code());
     }
 
     // IGamepad:
@@ -518,7 +519,7 @@ class Device : public Core::Device
       }
       catch (winrt::hresult_error error)
       {
-        ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {:x}",
+        ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {}",
                       error.code());
       }
     }

diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
@@ -4,7 +4,8 @@
 #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
 
 #include <algorithm>
-#include <fmt/os.h>
+
+#include <fmt/std.h>
 
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h
@@ -1863,7 +1863,7 @@ enum class ColorChannel : u32
 template <>
 struct fmt::formatter<ColorChannel> : EnumFormatter<ColorChannel::Alpha>
 {
-  formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {}
+  constexpr formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {}
 };
 
 enum class KonstSel : u32

diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h
@@ -98,7 +98,6 @@ struct EFBCopyParams
 template <>
 struct fmt::formatter<EFBCopyParams>
 {
-  std::shared_ptr<int> state;
   constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
   template <typename FormatContext>
   auto format(const EFBCopyParams& uid, FormatContext& ctx) const