diff --git a/format b/format
index 9791f9e..376479e 100755
--- a/format
+++ b/format
@@ -1,2 +1,2 @@
 #!/bin/bash
-find include libc src -name '*.h' -o -name '*.c' | xargs clang-format -i
+find include libc src -name '*.h' -o -name '*.c' -o -name '*.hpp' -o -name '*.cpp' | xargs clang-format -i
diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml
index 9281d5e..5c847a0 100755
--- a/tools/permuter_settings.toml
+++ b/tools/permuter_settings.toml
@@ -1,6 +1,6 @@
 compiler_type = "mwcc"
-compiler_command = "wibo tools/mwcc_compiler/GC/3.0a5/mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto,deferred -nodefaults -msgstyle gcc -Iinclude -Ilibc -Ibuild/oot-j/include -c"
-assembler_command = "tools/binutils/powerpc-eabi-as -mgekko"
+compiler_command = "build/tools/wibo build/compilers/GC/3.0a5/mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto,deferred -nodefaults -msgstyle gcc -Iinclude -Ilibc -Ibuild/oot-j/include -c"
+assembler_command = "build/binutils/powerpc-eabi-as -mgekko"
 asm_prelude_file = "include/macros.inc"
 
 [preserve_macros]