diff --git a/orbis-kernel/include/orbis/KernelContext.hpp b/orbis-kernel/include/orbis/KernelContext.hpp
index fefc92726..fcca34885 100644
--- a/orbis-kernel/include/orbis/KernelContext.hpp
+++ b/orbis-kernel/include/orbis/KernelContext.hpp
@@ -214,8 +214,8 @@ public:
   bool isDevKit = false;
 
   Ref<Budget> createProcessTypeBudget(Budget::ProcessType processType,
-                              std::string_view name,
-                              std::span<const BudgetInfo> items) {
+                                      std::string_view name,
+                                      std::span<const BudgetInfo> items) {
     auto budget = orbis::knew<orbis::Budget>(name, processType, items);
     processTypeBudgets[static_cast<int>(processType)] =
         orbis::knew<orbis::Budget>(name, processType, items);
diff --git a/orbis-kernel/src/sys/sys_sig.cpp b/orbis-kernel/src/sys/sys_sig.cpp
index 52725b25e..95f15f4dd 100644
--- a/orbis-kernel/src/sys/sys_sig.cpp
+++ b/orbis-kernel/src/sys/sys_sig.cpp
@@ -1,8 +1,8 @@
 #include "KernelContext.hpp"
 #include "sys/sysproto.hpp"
 #include "thread/Process.hpp"
-#include "thread/Thread.hpp"
 #include "thread/ProcessOps.hpp"
+#include "thread/Thread.hpp"
 #include "ucontext.hpp"
 #include "utils/Logs.hpp"
 #include <csignal>
diff --git a/orbis-kernel/src/utils/Logs.cpp b/orbis-kernel/src/utils/Logs.cpp
index 685d0bb51..9b38ba877 100644
--- a/orbis-kernel/src/utils/Logs.cpp
+++ b/orbis-kernel/src/utils/Logs.cpp
@@ -489,7 +489,8 @@ void _orbis_log_print(LogLevel lvl, std::string_view msg,
   for (std::size_t i = 0; i < args_count; i++) {
     if (i)
       text += ", ";
-    names.remove_prefix(std::min(names.find_first_not_of(" \t\n\r"), names.length()));
+    names.remove_prefix(
+        std::min(names.find_first_not_of(" \t\n\r"), names.length()));
     std::string_view name = names.substr(0, names.find_first_of(','));
     names.remove_prefix(std::min(name.size() + 1, names.size()));
     text += name;
diff --git a/ps3fw/cellAudio.cpp b/ps3fw/cellAudio.cpp
index 072309dc1..3800385db 100644
--- a/ps3fw/cellAudio.cpp
+++ b/ps3fw/cellAudio.cpp
@@ -109,7 +109,7 @@ void cell_audio_config::reset(bool backend_changed)
 
 	desired_full_buffers = buffering_enabled ? static_cast<u32>(desired_buffer_duration / audio_block_period) + 3 : 2;
 
-  if (desired_full_buffers > MAX_AUDIO_BUFFERS + EXTRA_AUDIO_BUFFERS)
+	if (desired_full_buffers > MAX_AUDIO_BUFFERS + EXTRA_AUDIO_BUFFERS)
 	{
 		cellAudio.error("%s: desired_full_buffers truncation: value = %d, frame size = %f, output channel count = %d, input channel count = %d, desired buffer duration = %d",
 			backend->GetName(), desired_full_buffers, cb_frame_len, ch_cnt, audio_channels, desired_buffer_duration);
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/gcn.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/gcn.hpp
index 1eb9db73e..217c818c9 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/gcn.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/gcn.hpp
@@ -70,8 +70,7 @@ struct Context : spv::Context {
 
   std::pair<ir::Value, bool> getOrCreateLabel(ir::Location loc, ir::Region body,
                                               std::uint64_t address);
-  Builder createBuilder(ir::Region bodyRegion,
-                        std::uint64_t address);
+  Builder createBuilder(ir::Region bodyRegion, std::uint64_t address);
 
   ir::Value createCast(ir::Location loc, Builder &builder, ir::Value targetType,
                        ir::Value value);
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Builder.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Builder.hpp
index 01a85128f..d7a93464b 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Builder.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Builder.hpp
@@ -113,7 +113,7 @@ public:
   void setInsertionPoint(Instruction inst) { mInsertionPoint = inst; }
 
   InsertionPoint saveInsertionPoint() {
-    return { mInsertionStorage, mInsertionPoint };
+    return {mInsertionStorage, mInsertionPoint};
   }
 
   template <typename T, typename... ArgsT>
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Impl.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Impl.hpp
index 5a0508350..b6f9d04fb 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Impl.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/Impl.hpp
@@ -170,7 +170,7 @@ inline void RegionLikeImpl::addChild(Instruction node) {
     assert(node != thisInst);
   }
 #endif
-  
+
   node.get()->parent = this;
   if (first == nullptr) {
     first = node;
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
index 2b3287981..4587b3589 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "PrintOptions.hpp"
 #include "Location.hpp"
 #include "Node.hpp"
 #include "Operand.hpp"
+#include "PrintOptions.hpp"
 #include <cassert>
 #include <map>
 
@@ -60,7 +60,8 @@ struct NodeImpl {
   void setLocation(Location newLocation) { location = newLocation; }
   Location getLocation() const { return location; }
 
-  virtual void print(std::ostream &os, NameStorage &ns, const PrintOptions &opts) const = 0;
+  virtual void print(std::ostream &os, NameStorage &ns,
+                     const PrintOptions &opts) const = 0;
   virtual Node clone(Context &context, CloneMap &map) const = 0;
 };
 } // namespace shader::ir
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
index 911743745..503a86cf4 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
@@ -10,7 +10,8 @@ template <typename T> struct PrintableWrapper : PointerWrapper<T> {
   using PointerWrapper<T>::PointerWrapper;
   using PointerWrapper<T>::operator=;
 
-  void print(std::ostream &os, NameStorage &ns, const PrintOptions &opts = {}) const {
+  void print(std::ostream &os, NameStorage &ns,
+             const PrintOptions &opts = {}) const {
     if constexpr (requires { this->impl->print(os, ns, opts); }) {
       this->impl->print(os, ns, opts);
     } else if constexpr (requires { this->impl->print(os, ns); }) {
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp
index 03488f73a..664f6deb3 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp
@@ -34,9 +34,7 @@ struct RegionLikeWrapper : BaseWrapper<ImplT> {
     this->impl->printRegion(os, ns, opts);
   }
 
-  auto getParent() const {
-    return this->impl->getParent();
-  }
+  auto getParent() const { return this->impl->getParent(); }
 };
 
 struct RegionLikeImpl;
diff --git a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
index af785cb10..fe6381836 100644
--- a/rpcsx/gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
+++ b/rpcsx/gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
@@ -13,11 +13,11 @@ struct ValueImpl : InstructionImpl {
   using InstructionImpl::InstructionImpl;
 
   void addUse(Instruction user, int operandIndex) {
-    uses.insert({.user=user, .node=this, .operandIndex=operandIndex});
+    uses.insert({.user = user, .node = this, .operandIndex = operandIndex});
   }
 
   void removeUse(Instruction user, int operandIndex) {
-    uses.erase({.user=user, .node=this, .operandIndex=operandIndex});
+    uses.erase({.user = user, .node = this, .operandIndex = operandIndex});
   }
 
   std::set<Instruction> getUserList() const {
diff --git a/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp b/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
index faf41b588..7ccc406cd 100644
--- a/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
+++ b/rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
@@ -374,7 +374,8 @@ struct ResourcesBuilder {
         } else if (auto value = inst.cast<ir::Value>()) {
           resourcePhi.addOperand(value);
         } else {
-          auto block = resources.context.create<ir::Block>(inst.getLocation(), ir::Kind::Builtin, ir::builtin::BLOCK);
+          auto block = resources.context.create<ir::Block>(
+              inst.getLocation(), ir::Kind::Builtin, ir::builtin::BLOCK);
           inst.erase();
           block.addChild(inst);
           resourcePhi.addOperand(block);
@@ -1112,7 +1113,7 @@ static void expToSpv(GcnConverter &converter, gcn::Stage stage,
   };
 
   rx::println(stderr, "exp target {}.{}", targetToString(target),
-               swizzleToString(swizzle));
+              swizzleToString(swizzle));
   std::abort();
 }
 
diff --git a/rpcsx/iodev/gc.cpp b/rpcsx/iodev/gc.cpp
index d59157051..7fddddef4 100644
--- a/rpcsx/iodev/gc.cpp
+++ b/rpcsx/iodev/gc.cpp
@@ -406,7 +406,7 @@ static orbis::ErrorCode gc_ioctl(orbis::File *file, std::uint64_t request,
   case 0x802450c9: {
     // used during Net initialization
     rx::println(stderr, "***WARNING*** Unknown gc ioctl_{:x}(0x{:x})", request,
-                 (unsigned long)*(std::uint32_t *)argp);
+                (unsigned long)*(std::uint32_t *)argp);
     break;
   }
 
diff --git a/rpcsx/ops.cpp b/rpcsx/ops.cpp
index 7d1567bae..0628a882c 100644
--- a/rpcsx/ops.cpp
+++ b/rpcsx/ops.cpp
@@ -653,7 +653,7 @@ SysResult thr_wake(orbis::Thread *thread, orbis::slong id) {
 SysResult sigreturn(orbis::Thread *thread,
                     orbis::ptr<orbis::UContext> context) {
   rx::thread::setContext(thread, *context);
-  return{};
+  return {};
 }
 SysResult thr_set_name(orbis::Thread *thread, orbis::slong id,
                        orbis::ptr<const char> name) {
diff --git a/rx/include/rx/FunctionRef.hpp b/rx/include/rx/FunctionRef.hpp
index 3c5eb66bf..630eb1cb1 100644
--- a/rx/include/rx/FunctionRef.hpp
+++ b/rx/include/rx/FunctionRef.hpp
@@ -13,7 +13,8 @@ template <typename RT, typename... ArgsT> class FunctionRef<RT(ArgsT...)> {
 public:
   constexpr FunctionRef() = default;
 
-  template <typename T> requires (!std::is_same_v<std::remove_cvref_t<T>, FunctionRef>)
+  template <typename T>
+    requires(!std::is_same_v<std::remove_cvref_t<T>, FunctionRef>)
   constexpr FunctionRef(T &&object)
     requires requires(ArgsT... args) { RT(object(args...)); }
       : context(