diff --git a/.clang-format b/.clang-format
index d7601961c..fac02f27b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,6 +4,10 @@ BasedOnStyle: Google
 ColumnLimit: 120
 UseTab: Never
 AllowShortFunctionsOnASingleLine: Empty
+IndentPPDirectives: AfterHash
+SortIncludes: true
+FixNamespaceComments: true
+InsertBraces: true
 QualifierAlignment: Left
 PointerAlignment: Right
 ReferenceAlignment: Right
diff --git a/3rdparty/stb_library.hpp b/3rdparty/stb_library.hpp
index 3086f94d4..65e6c1c50 100644
--- a/3rdparty/stb_library.hpp
+++ b/3rdparty/stb_library.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
 #if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-align"
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wcast-align"
 #endif
 
 #include "stb/stb_image.h"
 
 #if defined(__clang__)
-#pragma clang diagnostic pop
+#  pragma clang diagnostic pop
 #endif
diff --git a/modules/util/include/util.hpp b/modules/util/include/util.hpp
index 51739b9c0..b914bcae8 100644
--- a/modules/util/include/util.hpp
+++ b/modules/util/include/util.hpp
@@ -8,14 +8,14 @@
 #include <string>
 #include <typeinfo>
 #ifdef __GNUG__
-#include <cxxabi.h>
+#  include <cxxabi.h>
 #endif
 
 #include "nlohmann/json_fwd.hpp"
 
 #ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4459)
+#  pragma warning(push)
+#  pragma warning(disable : 4459)
 #endif
 
 #include <nlohmann/json.hpp>
@@ -25,7 +25,7 @@ using NlohmannJsonParseError = nlohmann::json::parse_error;
 /// @brief JSON namespace used for settings and config typing.
 using NlohmannJsonTypeError = nlohmann::json::type_error;
 #ifdef _MSC_VER
-#pragma warning(pop)
+#  pragma warning(pop)
 #endif
 
 namespace ppc::util {