diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index c870df8e..c7978c14 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -7,8 +7,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Run clang-format style check for C/C++/Protobuf programs.
-      uses: jidicula/clang-format-action@v4.15.0
+      uses: jidicula/clang-format-action@v4.18.0
       with:
-        clang-format-version: '20'
+        clang-format-version: '22'
         check-path: 'OptiScaler'
         exclude-regex: 'external/|OptiScaler/include/'
diff --git a/OptiScaler/Config.h b/OptiScaler/Config.h
index 74e32d61..891f7125 100644
--- a/OptiScaler/Config.h
+++ b/OptiScaler/Config.h
@@ -100,12 +100,13 @@ template <class T, HasDefaultValue defaultState = WithDefault> class CustomOptio
     }
 
     constexpr T value_or_default() &&
-        requires(defaultState != NoDefault) {
-            return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
-        }
+        requires(defaultState != NoDefault)
+    {
+        return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
+    }
 
-        constexpr std::optional<T> value_for_config()
-            requires(defaultState == WithDefault)
+    constexpr std::optional<T> value_for_config()
+        requires(defaultState == WithDefault)
     {
         if (_volatile)
         {
diff --git a/OptiScaler/proxies/NVNGX_Proxy.h b/OptiScaler/proxies/NVNGX_Proxy.h
index 8fc32b7b..f6c08e50 100644
--- a/OptiScaler/proxies/NVNGX_Proxy.h
+++ b/OptiScaler/proxies/NVNGX_Proxy.h
@@ -31,9 +31,9 @@ inline static PFN_NVSDK_NGX_D3D1X_GetFeatureRequirements Original_D3D11_GetFeatu
 inline static PFN_NVSDK_NGX_D3D1X_GetFeatureRequirements Original_D3D12_GetFeatureRequirements = nullptr;
 inline static PFN_NVSDK_NGX_VULKAN_GetFeatureRequirements Original_Vulkan_GetFeatureRequirements = nullptr;
 
-inline static NVSDK_NGX_Result __stdcall Hooked_Dx12_GetFeatureRequirements(
-    IDXGIAdapter* Adapter, const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo,
-    NVSDK_NGX_FeatureRequirement* OutSupported)
+inline static NVSDK_NGX_Result __stdcall
+Hooked_Dx12_GetFeatureRequirements(IDXGIAdapter* Adapter, const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo,
+                                   NVSDK_NGX_FeatureRequirement* OutSupported)
 {
     LOG_FUNC();
 
@@ -50,9 +50,9 @@ inline static NVSDK_NGX_Result __stdcall Hooked_Dx12_GetFeatureRequirements(
     return result;
 }
 
-inline static NVSDK_NGX_Result __stdcall Hooked_Dx11_GetFeatureRequirements(
-    IDXGIAdapter* Adapter, const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo,
-    NVSDK_NGX_FeatureRequirement* OutSupported)
+inline static NVSDK_NGX_Result __stdcall
+Hooked_Dx11_GetFeatureRequirements(IDXGIAdapter* Adapter, const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo,
+                                   NVSDK_NGX_FeatureRequirement* OutSupported)
 {
     LOG_FUNC();
 
@@ -69,9 +69,10 @@ inline static NVSDK_NGX_Result __stdcall Hooked_Dx11_GetFeatureRequirements(
     return result;
 }
 
-inline static NVSDK_NGX_Result __stdcall Hooked_Vulkan_GetFeatureRequirements(
-    const VkInstance Instance, const VkPhysicalDevice PhysicalDevice,
-    const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo, NVSDK_NGX_FeatureRequirement* OutSupported)
+inline static NVSDK_NGX_Result __stdcall
+Hooked_Vulkan_GetFeatureRequirements(const VkInstance Instance, const VkPhysicalDevice PhysicalDevice,
+                                     const NVSDK_NGX_FeatureDiscoveryInfo* FeatureDiscoveryInfo,
+                                     NVSDK_NGX_FeatureRequirement* OutSupported)
 {
     LOG_FUNC();