diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b5dfb1..2c1af85 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,42 +4,44 @@
 name: main
 
 on:
-  push:
-    branches:
-      - "**"
+  pull_request:
+  merge_group:
 
 jobs:
+  typos-check:
+    name: Typos Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/typos@v1.19.0
+
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: jidicula/clang-format-action@v4.9.0
-        with: { clang-format-version: "16" }
+      - uses: jidicula/clang-format-action@v4.11.0
+        with: { clang-format-version: "18" }
 
   test-windows:
     runs-on: windows-latest
     steps:
-      - name: Ecsact SDK
-        uses: ecsact-dev/github-action@0.1.0
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             /Users/runneradmin/AppData/Local/bazelisk
             /Users/runneradmin/.cache/bazel-disk-cache
           key: ${{runner.os}}-bazel-cache
       - uses: actions/checkout@v4
-      - run: bazelisk --output_user_root=C:/tmp build --config=ci //...
+      - run: bazelisk build --config=ci //...
       - if: ${{ hashfiles('test/MODULE.bazel') != '' }}
-        run: bazelisk --output_user_root=C:/tmp test --config=ci ...
+        run: bazelisk test --config=ci ...
         working-directory: test
 
   test-linux:
     runs-on: ubuntu-latest
     steps:
-      - name: Ecsact SDK
-        uses: ecsact-dev/github-action@0.1.0
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/bazelisk
diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc
index 50ddd64..2de0b25 100644
--- a/bazel/common.bazelrc
+++ b/bazel/common.bazelrc
@@ -10,9 +10,6 @@ build --enable_runfiles
 build --noincompatible_remove_rule_name_parameter
 query --noincompatible_remove_rule_name_parameter
 
-# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
-build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
-
 common:ci --announce_rc
 common:ci --verbose_failures
 common:ci --keep_going
diff --git a/bazel/copts.bzl b/bazel/copts.bzl
index 3195fed..b8ebf62 100644
--- a/bazel/copts.bzl
+++ b/bazel/copts.bzl
@@ -10,7 +10,7 @@ copts = selects.with_or({
         "-fexperimental-library",
     ],
     ("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [
-        "/std:c++latest",
+        "/std:c++20",
         "/permissive-",
         "/Zc:preprocessor",
     ],
diff --git a/rt_entt_codegen/core/print_sys_exec.cc b/rt_entt_codegen/core/print_sys_exec.cc
index 0390194..b43f7c0 100644
--- a/rt_entt_codegen/core/print_sys_exec.cc
+++ b/rt_entt_codegen/core/print_sys_exec.cc
@@ -443,8 +443,9 @@ static auto print_sys_exec_ctx_generate(
 	});
 }
 
-static auto print_sys_exec_ctx_parent(ecsact::codegen_plugin_context& ctx)
-	-> void {
+static auto print_sys_exec_ctx_parent( //
+	ecsact::codegen_plugin_context& ctx
+) -> void {
 	using ecsact::rt_entt_codegen::util::method_printer;
 
 	auto printer = //
@@ -761,8 +762,9 @@ static auto get_unique_view_name() -> std::string {
 }
 
 template<typename ComponentLikeID>
-static auto create_context_struct_name(ComponentLikeID component_like_id)
-	-> std::string {
+static auto create_context_struct_name( //
+	ComponentLikeID component_like_id
+) -> std::string {
 	using ecsact::cc_lang_support::c_identifier;
 	auto full_name =
 		c_identifier(ecsact::meta::decl_full_name(component_like_id));
@@ -770,8 +772,9 @@ static auto create_context_struct_name(ComponentLikeID component_like_id)
 }
 
 template<typename ComponentLikeID>
-static auto create_context_var_name(ComponentLikeID component_like_id)
-	-> std::string {
+static auto create_context_var_name( //
+	ComponentLikeID component_like_id
+) -> std::string {
 	using ecsact::cc_lang_support::c_identifier;
 	auto full_name =
 		c_identifier(ecsact::meta::decl_full_name(component_like_id));
diff --git a/typos.toml b/typos.toml
new file mode 100644
index 0000000..3ffc3da
--- /dev/null
+++ b/typos.toml
@@ -0,0 +1,5 @@
+[files]
+extend-exclude = ["CHANGELOG.md"]
+
+[default]
+extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]