diff --git a/CMakeLists.txt b/CMakeLists.txt
index 822faae..9240629 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@
 # 3.24.1 is also bundled in CLion as of 2023
 cmake_minimum_required(VERSION 3.24.1)
 
+
 # This tells cmake we have goodies in the /cmake folder
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include (PamplejuceVersion)
@@ -9,6 +10,9 @@ include (PamplejuceVersion)
 # Configures universal binaries and decides which version of macOS to support
 include(PamplejuceMacOS)
 
+# Couple tweaks that IMO should be JUCE defaults
+include(JUCEDefaults)
+
 # Change me!
 # This is the internal name of the project and the name of JUCE's shared code target
 # Note: This cannot have spaces (it may be 2024, but you can't have it all!)
@@ -36,9 +40,6 @@ set(FORMATS Standalone AU VST3 AUv3)
 # For simplicity, the name of the CMake project is also the name of the target
 project(${PROJECT_NAME} VERSION ${CURRENT_VERSION})
 
-# Couple tweaks that IMO should be JUCE defaults
-include(JUCEDefaults)
-
 # JUCE is setup as a submodule in the /JUCE folder
 # Locally, you must run `git submodule update --init --recursive` once
 # and later `git submodule update --remote --merge` to keep it up to date
@@ -84,9 +85,8 @@ juce_add_plugin("${PROJECT_NAME}"
 # Without running into ODR violations
 add_library(SharedCode INTERFACE)
 
-# C++20, please
-# Use cxx_std_23 for C++23 (as of CMake v 3.20)
-target_compile_features(SharedCode INTERFACE cxx_std_20)
+# Enable fast math, C++20 and a few other target defaults
+include(SharedCodeDefaults)
 
 # Manually list all .h and .cpp files for the plugin
 # If you are like me, you'll use globs for your sanity.
@@ -149,8 +149,8 @@ include(PamplejuceIPP)
 # Everything related to the tests target
 include(Tests)
 
-# A separate target keeps the Tests target fast!
+# A separate target for Benchmarks (keeps the Tests target fast)
 include(Benchmarks)
 
-# Pass some config to GA (like our PRODUCT_NAME)
+# Output some config for CI (like our PRODUCT_NAME)
 include(GitHubENV)
diff --git a/cmake b/cmake
index d7ae0ff..f3d66d0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d7ae0ff75b909c52d3d508bf48cc199cf4305cae
+Subproject commit f3d66d09b4404148da56aec2bbc8009e7a0cba38