diff --git a/.cmake-format.py b/.cmake-format.py
new file mode 100644
index 000000000..ed090568a
--- /dev/null
+++ b/.cmake-format.py
@@ -0,0 +1,238 @@
+# ----------------------------------
+# Options affecting listfile parsing
+# ----------------------------------
+with section("parse"):
+    # Specify structure for custom cmake functions
+    additional_commands = {
+        "foo": {
+            "flags": ["BAR", "BAZ"],
+            "kwargs": {"DEPENDS": "*", "HEADERS": "*", "SOURCES": "*"},
+        }
+    }
+
+    # Override configurations per-command where available
+    override_spec = {}
+
+    # Specify variable tags.
+    vartags = []
+
+    # Specify property tags.
+    proptags = []
+
+# -----------------------------
+# Options affecting formatting.
+# -----------------------------
+with section("format"):
+    # Disable formatting entirely, making cmake-format a no-op
+    disable = False
+
+    # How wide to allow formatted cmake files
+    line_width = 100
+
+    # How many spaces to tab for indent
+    tab_size = 2
+
+    # If true, lines are indented using tab characters (utf-8 0x09) instead of
+    # <tab_size> space characters (utf-8 0x20). In cases where the layout would
+    # require a fractional tab character, the behavior of the  fractional
+    # indentation is governed by <fractional_tab_policy>
+    use_tabchars = False
+
+    # If <use_tabchars> is True, then the value of this variable indicates how
+    # fractional indentions are handled during whitespace replacement. If set to
+    # 'use-space', fractional indentation is left as spaces (utf-8 0x20). If set
+    # to `round-up` fractional indentation is replaced with a single tab character
+    # (utf-8 0x09) effectively shifting the column to the next tabstop
+    fractional_tab_policy = "use-space"
+
+    # If an argument group contains more than this many sub-groups (parg or kwarg
+    # groups) then force it to a vertical layout.
+    max_subgroups_hwrap = 4
+
+    # If a positional argument group contains more than this many arguments, then
+    # force it to a vertical layout.
+    max_pargs_hwrap = 6
+
+    # If a cmdline positional group consumes more than this many lines without
+    # nesting, then invalidate the layout (and nest)
+    max_rows_cmdline = 2
+
+    # If true, separate flow control names from their parentheses with a space
+    separate_ctrl_name_with_space = False
+
+    # If true, separate function names from parentheses with a space
+    separate_fn_name_with_space = False
+
+    # If a statement is wrapped to more than one line, than dangle the closing
+    # parenthesis on its own line.
+    dangle_parens = False
+
+    # If the trailing parenthesis must be 'dangled' on its on line, then align it
+    # to this reference: `prefix`: the start of the statement,  `prefix-indent`:
+    # the start of the statement, plus one indentation  level, `child`: align to
+    # the column of the arguments
+    dangle_align = "prefix"
+
+    # If the statement spelling length (including space and parenthesis) is
+    # smaller than this amount, then force reject nested layouts.
+    min_prefix_chars = 4
+
+    # If the statement spelling length (including space and parenthesis) is larger
+    # than the tab width by more than this amount, then force reject un-nested
+    # layouts.
+    max_prefix_chars = 10
+
+    # If a candidate layout is wrapped horizontally but it exceeds this many
+    # lines, then reject the layout.
+    max_lines_hwrap = 2
+
+    # What style line endings to use in the output.
+    line_ending = "unix"
+
+    # Format command names consistently as 'lower' or 'upper' case
+    command_case = "canonical"
+
+    # Format keywords consistently as 'lower' or 'upper' case
+    keyword_case = "upper"
+
+    # A list of command names which should always be wrapped
+    always_wrap = []
+
+    # If true, the argument lists which are known to be sortable will be sorted
+    # lexicographicall
+    enable_sort = True
+
+    # If true, the parsers may infer whether or not an argument list is sortable
+    # (without annotation).
+    autosort = False
+
+    # By default, if cmake-format cannot successfully fit everything into the
+    # desired linewidth it will apply the last, most aggressive attempt that it
+    # made. If this flag is True, however, cmake-format will print error, exit
+    # with non-zero status code, and write-out nothing
+    require_valid_layout = False
+
+    # A dictionary mapping layout nodes to a list of wrap decisions. See the
+    # documentation for more information.
+    layout_passes = {}
+
+# ------------------------------------------------
+# Options affecting comment reflow and formatting.
+# ------------------------------------------------
+with section("markup"):
+    # What character to use for bulleted lists
+    bullet_char = "*"
+
+    # What character to use as punctuation after numerals in an enumerated list
+    enum_char = "."
+
+    # If comment markup is enabled, don't reflow the first comment block in each
+    # listfile. Use this to preserve formatting of your copyright/license
+    # statements.
+    first_comment_is_literal = False
+
+    # If comment markup is enabled, don't reflow any comment block which matches
+    # this (regex) pattern. Default is `None` (disabled).
+    literal_comment_pattern = None
+
+    # Regular expression to match preformat fences in comments default=
+    # ``r'^\s*([`~]{3}[`~]*)(.*)$'``
+    fence_pattern = "^\\s*([`~]{3}[`~]*)(.*)$"
+
+    # Regular expression to match rulers in comments default=
+    # ``r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'``
+    ruler_pattern = "^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$"
+
+    # If a comment line matches starts with this pattern then it is explicitly a
+    # trailing comment for the preceding argument. Default is '#<'
+    explicit_trailing_pattern = "#<"
+
+    # If a comment line starts with at least this many consecutive hash
+    # characters, then don't lstrip() them off. This allows for lazy hash rulers
+    # where the first hash char is not separated by space
+    hashruler_min_length = 10
+
+    # If true, then insert a space between the first hash char and remaining hash
+    # chars in a hash ruler, and normalize its length to fill the column
+    canonicalize_hashrulers = True
+
+    # enable comment markup parsing and reflow
+    enable_markup = True
+
+# ----------------------------
+# Options affecting the linter
+# ----------------------------
+with section("lint"):
+    # a list of lint codes to disable
+    disabled_codes = []
+
+    # regular expression pattern describing valid function names
+    function_pattern = "[0-9a-z_]+"
+
+    # regular expression pattern describing valid macro names
+    macro_pattern = "[0-9A-Z_]+"
+
+    # regular expression pattern describing valid names for variables with global
+    # (cache) scope
+    global_var_pattern = "[A-Z][0-9A-Z_]+"
+
+    # regular expression pattern describing valid names for variables with global
+    # scope (but internal semantic)
+    internal_var_pattern = "_[A-Z][0-9A-Z_]+"
+
+    # regular expression pattern describing valid names for variables with local
+    # scope
+    local_var_pattern = "[a-z][a-z0-9_]+"
+
+    # regular expression pattern describing valid names for privatedirectory
+    # variables
+    private_var_pattern = "_[0-9a-z_]+"
+
+    # regular expression pattern describing valid names for public directory
+    # variables
+    public_var_pattern = "[A-Z][0-9A-Z_]+"
+
+    # regular expression pattern describing valid names for function/macro
+    # arguments and loop variables.
+    argument_var_pattern = "[a-z][a-z0-9_]+"
+
+    # regular expression pattern describing valid names for keywords used in
+    # functions or macros
+    keyword_pattern = "[A-Z][0-9A-Z_]+"
+
+    # In the heuristic for C0201, how many conditionals to match within a loop in
+    # before considering the loop a parser.
+    max_conditionals_custom_parser = 2
+
+    # Require at least this many newlines between statements
+    min_statement_spacing = 1
+
+    # Require no more than this many newlines between statements
+    max_statement_spacing = 2
+    max_returns = 6
+    max_branches = 12
+    max_arguments = 5
+    max_localvars = 15
+    max_statements = 50
+
+# -------------------------------
+# Options affecting file encoding
+# -------------------------------
+with section("encode"):
+    # If true, emit the unicode byte-order mark (BOM) at the start of the file
+    emit_byteorder_mark = False
+
+    # Specify the encoding of the input file. Defaults to utf-8
+    input_encoding = "utf-8"
+
+    # Specify the encoding of the output file. Defaults to utf-8. Note that cmake
+    # only claims to support utf-8 so be careful when using anything else
+    output_encoding = "utf-8"
+
+# -------------------------------------
+# Miscellaneous configurations options.
+# -------------------------------------
+with section("misc"):
+    # A dictionary containing any per-command configuration overrides. Currently
+    # only `command_case` is supported.
+    per_command = {}
diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml
new file mode 100644
index 000000000..1fc1122f0
--- /dev/null
+++ b/.github/workflows/clang_format.yml
@@ -0,0 +1,17 @@
+name: clang-format
+
+on:
+  merge_group:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  formatting-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - name: Check formatting
+      uses: jidicula/clang-format-action@v4.15.0
+      with:
+        clang-format-version: '18'
diff --git a/.gitignore b/.gitignore
index e37b449eb..33bf9be72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ manual/ippl_user_guide.pdf
 build*/
 *~
 *.~
+*.orig
 
 # ignore build directories
 build*/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8721b63e..a6c037b23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,37 @@
-cmake_minimum_required(VERSION 3.20)
-
-project(IPPL LANGUAGES CXX VERSION 3.0.2)
-
-include(GNUInstallDirs)
-
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# ------------------------------------------------------------------------------
+# CMake version requirement
+# ------------------------------------------------------------------------------
+cmake_minimum_required(VERSION 3.24)
+
+# ------------------------------------------------------------------------------
+# Policies - use the latest of everything
+# ------------------------------------------------------------------------------
+cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+
+# but disable c++20 module scanning until we have better support for it this seems to cause some
+# problems when using gcc@14
+cmake_policy(SET CMP0155 OLD)
+
+# ------------------------------------------------------------------------------
+# Project declaration and version
+# ------------------------------------------------------------------------------
+project(IPPL VERSION 3.2 LANGUAGES CXX)
+
+# ------------------------------------------------------------------------------
+# Module path, setup before including any cmake modules
+# ------------------------------------------------------------------------------
+list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/CMakeModules")
+
+# ------------------------------------------------------------------------------
+# Project setup
+# ------------------------------------------------------------------------------
+include(ProjectSetup)
 
+# ------------------------------------------------------------------------------
+# Primary IPPL options
+# ------------------------------------------------------------------------------
+set(IPPL_PLATFORMS "Platforms to build IPPL for" CACHE STRING "OPENMP;CUDA")
+option(BUILD_SHARED_LIBS "Build IPPL as a shared library" OFF)
 option(IPPL_ENABLE_UNIT_TESTS "Enable unit tests using GoogleTest" OFF)
 option(IPPL_ENABLE_FFT "Enable FFT support" OFF)
 option(IPPL_ENABLE_SOLVERS "Enable IPPL solvers" OFF)
@@ -13,31 +39,67 @@ option(IPPL_ENABLE_ALPINE "Enable building the Alpine module" OFF)
 option(IPPL_ENABLE_COSMOLOGY "Enable building the Cosmology module" OFF)
 option(IPPL_ENABLE_EXAMPLES "Enable building the Example module" OFF)
 option(IPPL_ENABLE_TESTS "Build integration tests in test/ directory" OFF)
-option(BUILD_SHARED_LIBS "Build libraries as shared" OFF)
-option(IPPL_DYL "Build IPPL as a shared library (compat shim for BUILD_SHARED_LIBS)" OFF)
-if(IPPL_DYL)
-  set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
-  message(WARNING "IPPL_DYL is deprecated; use -DBUILD_SHARED_LIBS=ON instead.")
-endif()
 option(IPPL_ENABLE_COVERAGE "Enable code coverage" OFF)
 option(IPPL_ENABLE_NSYS_PROFILER "Enable Nvidia Nsys Profiler" OFF)
 option(IPPL_ENABLE_SANITIZER "Enable sanitizer(s)" OFF)
-option(USE_ALTERNATIVE_VARIANT "Use modified variant implementation (required for CUDA 12.2 + GCC 12.3.0)" OFF)
-
-
-add_compile_options(
-  $<$<COMPILE_LANG_AND_ID:C,Clang,AppleClang,GNU>:-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.>
-  $<$<COMPILE_LANG_AND_ID:CXX,Clang,AppleClang,GNU>:-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.>
-)
-
-include(ProjectSetup)
-include(Version)
-include(Dependencies)
+option(IPPL_USE_ALTERNATIVE_VARIANT
+       "Use modified variant implementation (required for CUDA 12.2 + GCC 12.3.0)" OFF)
+option(IPPL_USE_STANDARD_FOLDERS "Put all generated binaries in bin/lib folders" OFF)
+option(IPPL_SKIP_FAILING_TESTS "Do not build/test tests that are currently marked as failing" OFF)
+# option(IPPL_DYL "Build IPPL as a shared library (ON) or static library (OFF)" OFF) if(IPPL_DYL)
+# set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) message(WARNING "IPPL_DYL is deprecated; use
+# -DBUILD_SHARED_LIBS=ON instead.") endif()
+
+# ------------------------------------------------------------------------------
+# Setup Output directories
+# ------------------------------------------------------------------------------
+if(IPPL_USE_STANDARD_FOLDERS)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin
+      CACHE PATH "Single Directory for all Executables.")
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
+      CACHE PATH "Single Directory for all Libraries")
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib
+      CACHE PATH "Single Directory for all static libraries.")
+else()
+  unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY CACHE)
+  unset(CMAKE_LIBRARY_OUTPUT_DIRECTORY CACHE)
+  unset(CMAKE_ARCHIVE_OUTPUT_DIRECTORY CACHE)
+endif()
 
-add_subdirectory(src)
+# ------------------------------------------------------------------------------
+# cmake modules
+# ------------------------------------------------------------------------------
+# cmake supplied modules
+include(GNUInstallDirs)
+include(FetchContent)
+include(CMakePackageConfigHelpers)
+include(ExternalProject)
+include(CTest)
 
+# custom modules
+include(Messages)
 include(CompilerOptions)
 include(Platforms)
+include(Dependencies)
+include(FailingTests)
+
+# ------------------------------------------------------------------------------
+# Deprecated vars
+# ------------------------------------------------------------------------------
+if(DEFINED USE_ALTERNATIVE_VARIANT)
+  colour_message(
+    WARNING ${Red}
+    "USE_ALTERNATIVE_VARIANT is deprecated. Please set IPPL_USE_ALTERNATIVE_VARIANT instead.")
+  set(IPPL_USE_ALTERNATIVE_VARIANT ${USE_ALTERNATIVE_VARIANT} CACHE BOOL "" FORCE)
+endif()
+
+# ------------------------------------------------------------------------------
+# Debug: This tells the compiler to replace occurrences of ${<DIR>} with <x> in debug info and error
+# messages.
+# ------------------------------------------------------------------------------
+add_compile_options(
+  $<$<COMPILE_LANG_AND_ID:C,Clang,AppleClang,GNU>:-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.>
+  $<$<COMPILE_LANG_AND_ID:CXX,Clang,AppleClang,GNU>:-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.>)
 
 if(DEFINED FETCHCONTENT_BASE_DIR)
   add_compile_options(
@@ -46,16 +108,19 @@ if(DEFINED FETCHCONTENT_BASE_DIR)
   )
 endif()
 
-if(NOT DEFINED BUILD_TESTING)
-  set(BUILD_TESTING OFF CACHE BOOL "Enable tests via CTest")
-endif()
+# ------------------------------------------------------------------------------
+# Define sources for project
+# ------------------------------------------------------------------------------
+add_subdirectory(src)
 
+# ------------------------------------------------------------------------------
+# Include testing related material (BUILD_TESTING is defined in CTest module)
+# ------------------------------------------------------------------------------
 if(IPPL_ENABLE_UNIT_TESTS OR IPPL_ENABLE_TESTS)
   set(BUILD_TESTING ON CACHE BOOL "" FORCE)
 endif()
 
 if(PROJECT_IS_TOP_LEVEL AND BUILD_TESTING)
-  include(CTest)
   if(IPPL_ENABLE_UNIT_TESTS)
     add_subdirectory(unit_tests)
   endif()
@@ -64,14 +129,17 @@ if(PROJECT_IS_TOP_LEVEL AND BUILD_TESTING)
   endif()
 endif()
 
+# ------------------------------------------------------------------------------
+# Include optional source directories
+# ------------------------------------------------------------------------------
 if(IPPL_ENABLE_ALPINE)
-    add_subdirectory(alpine)
+  add_subdirectory(alpine)
 endif()
 
 if(IPPL_ENABLE_COSMOLOGY)
-    add_subdirectory(cosmology)
+  add_subdirectory(cosmology)
 endif()
 
 if(IPPL_ENABLE_EXAMPLES)
-    add_subdirectory(examples)
+  add_subdirectory(examples)
 endif()
diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json
new file mode 100644
index 000000000..30f4ab2e0
--- /dev/null
+++ b/CMakeUserPresets.json
@@ -0,0 +1,90 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 24,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "testing",
+      "hidden": true,
+      "cacheVariables": {
+        "IPPL_ENABLE_TESTS": "ON",
+        "IPPL_ENABLE_UNIT_TESTS": "ON"
+      }
+    },
+    {
+      "name": "default",
+      "displayName": "Default",
+      "description": "Default build, release mode with most common options",
+      "generator": "Unix Makefiles",
+      "cacheVariables": {
+        "BUILD_SHARED_LIBS": "ON",
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+        "Kokkos_VERSION_DEFAULT": "4.5.01",
+        "Heffte_VERSION_DEFAULT": "2.4.0",
+        "IPPL_PLATFORMS": "OPENMP;CUDA",
+        "IPPL_ENABLE_FFT": "ON",
+        "IPPL_ENABLE_ALPINE": "ON",
+        "IPPL_ENABLE_COSMOLOGY": "ON",
+        "IPPL_ENABLE_TESTS": "OFF",
+        "IPPL_ENABLE_UNIT_TESTS": "OFF",
+        "IPPL_USE_STANDARD_FOLDERS": "OFF"
+      }
+    },
+    {
+      "name": "fetch",
+      "displayName": "ForceDownload",
+      "description": "Always downloads dependencies",
+      "inherits": [
+        "default"
+      ],
+      "cacheVariables": {
+        "Kokkos_VERSION": "git.4.6.02",
+        "Heffte_VERSION": "git.v2.4.1"
+      }
+    },
+    {
+      "name": "release-testing",
+      "displayName": "Testing(Release)",
+      "description": "Enables building test in release mode",
+      "inherits": [
+        "testing",
+        "default"
+      ]
+    },
+    {
+      "name": "debug-testing",
+      "displayName": "Testing(Debug)",
+      "description": "Enables building test in debug mode",
+      "inherits": [
+        "testing",
+        "default"
+      ],
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "IPPL_ENABLE_SANITIZER": "ON",
+        "IPPL_PLATFORMS": "SERIAL"
+      }
+    },
+    {
+      "name": "alps-gh200",
+      "displayName": "Alps-GH200-defaults",
+      "description": "Enables building test in debug mode",
+      "inherits": [
+        "testing",
+        "default"
+      ],
+      "cacheVariables": {
+        "MPIEXEC_PREFLAGS": "--gpus-per-task=1;/user-environment/wrapper-mpi.sh",
+        "IPPL_PLATFORMS": "OPENMP;CUDA",
+        "CMAKE_CUDA_ARCHITECTURES": "90",
+        "MPIEXEC_EXECUTABLE": "/usr/bin/srun",
+        "Kokkos_VERSION_DEFAULT": "4.7",
+        "Heffte_VERSION_DEFAULT": "2.4.1"
+      }
+    }
+  ]
+}
diff --git a/README.md b/README.md
index 83c20e150..ea4532e6f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,34 @@
 [![License](https://img.shields.io/github/license/IPPL-framework/ippl)](https://github.com/IPPL-framework/ippl/blob/master/LICENSE)
 
 # Independent Parallel Particle Layer (IPPL)
-Independent Parallel Particle Layer (IPPL) is a performance portable C++ library for Particle-Mesh methods. IPPL makes use of Kokkos (https://github.com/kokkos/kokkos), HeFFTe (https://github.com/icl-utk-edu/heffte), and MPI (Message Passing Interface) to deliver a portable, massively parallel toolkit for particle-mesh methods. IPPL supports simulations in one to six dimensions, mixed precision, and asynchronous execution in different execution spaces (e.g. CPUs and GPUs). 
+
+## Table of Contents
+- [Independent Parallel Particle Layer (IPPL)](#independent-parallel-particle-layer-ippl)
+  - [Table of Contents](#table-of-contents)
+- [CI/CD](#cicd)
+- [Installing IPPL and its dependencies](#installing-ippl-and-its-dependencies)
+  - [Requirements](#requirements)
+    - [Optional requirements](#optional-requirements)
+  - [Compilation](#compilation)
+      - [None of the options have to be set explicitly, all have a default.](#none-of-the-options-have-to-be-set-explicitly-all-have-a-default)
+    - [Examples](#examples)
+      - [CMakeUserPresets](#cmakeuserpresets)
+      - [Serial debug build with tests and newest Kokkos](#serial-debug-build-with-tests-and-newest-kokkos)
+      - [OpenMP release build with alpine and FFTW](#openmp-release-build-with-alpine-and-fftw)
+      - [Cuda alpine release build](#cuda-alpine-release-build)
+      - [HIP release build (LUMI)](#hip-release-build-lumi)
+- [Contributions](#contributions)
+  - [Citing IPPL](#citing-ippl)
+- [Job scripts for running on Merlin and Gwendolen (at PSI)](#job-scripts-for-running-on-merlin-and-gwendolen-at-psi)
+  - [Merlin CPU (MPI + OpenMP)](#merlin-cpu-mpi--openmp)
+  - [Gwendolen GPU](#gwendolen-gpu)
+  - [LUMI GPU partition](#lumi-gpu-partition)
+- [Profiling IPPL MPI calls](#profiling-ippl-mpi-calls)
+- [Build Instructions](#build-instructions)
+  - [MERLIN 7 (PSI)](#merlin-7-psi)
+  - [ALPS (CSCS)](#alps-cscs)
+
+Independent Parallel Particle Layer (IPPL) is a performance portable C++ library for Particle-Mesh methods. IPPL makes use of Kokkos (https://github.com/kokkos/kokkos), HeFFTe (https://github.com/icl-utk-edu/heffte), and MPI (Message Passing Interface) to deliver a portable, massively parallel toolkit for particle-mesh methods. IPPL supports simulations in one to six dimensions, mixed precision, and asynchronous execution in different execution spaces (e.g. CPUs and GPUs).
 
 All IPPL releases (< 3.2.0) are available under the BSD 3-clause license. Since version 3.2.0, this repository includes a modified version of the `variant` header by GNU, created to support compilation under CUDA 12.2 with GCC 12.3.0. This header file is available under the same terms as the [GNU Standard Library](https://github.com/gcc-mirror/gcc); note the GNU runtime library exception. As long as this file is not removed, IPPL is available under GNU GPL version 3.
 
@@ -33,8 +60,8 @@ cmake <src_dir> -D<option>=<value>
 
 The relevant options of IPPL are
 - IPPL_PLATFORMS, can be one of `SERIAL, OPENMP, CUDA, "OPENMP;CUDA"`, default `SERIAL`
-- `Kokkos_VERSION`, default `4.1.00`
-- `Heffte_VERSION`, default `MASTER`
+- `Kokkos_VERSION`, default `4.5.00` 
+- `Heffte_VERSION`, default `4.7.1`
   - If set to `MASTER`, an additional flag `Heffte_COMMIT_HASH` can be set, default `9eab7c0eb18e86acaccc2b5699b30e85a9e7bdda`
   - Currently, this is the only compatible commit of Heffte
 - `IPPL_DYL`, default `OFF`
@@ -42,13 +69,21 @@ The relevant options of IPPL are
 - `IPPL_ENABLE_FFT`, default `OFF`
   - If `IPPL_ENABLE_FFT` is set, `Heffte_ENABLE_CUDA` will default to `ON` if `IPPL_PLATFORMS` contains `cuda`
   - Otherwise, `Heffte_ENABLE_AVX2` is enabled. FFTW has to be enabled explicitly.
-- `Heffte_ENABLE_FFTW`, default `OFF` 
+- `Heffte_ENABLE_FFTW`, default `OFF`
 - `IPPL_ENABLE_TESTS`, default `OFF`
 - `IPPL_ENABLE_UNIT_TESTS`, default `OFF`
 - `IPPL_ENABLE_ALPINE`, default `OFF`
-- `USE_ALTERNATIVE_VARIANT`, default `OFF`. Can be turned on for GPU builds where the use of the system-provided variant doesn't work.  
+- `IPPL_USE_ALTERNATIVE_VARIANT`, default `OFF`. Can be turned on for GPU builds where the use of the system-provided variant doesn't work.  
 - `IPPL_ENABLE_SANITIZER`, default `OFF`
-  
+
+`Kokkos` and `Heffte` by default will try to use version that are found on the sytem, if the system has `kokkos@4.6` and you set `Kokkos_VERSION=4.5` then cmake's find_package will consider the system version a match (newer than requested) and use it. The same applies for `Heffte`. You can override the variable to checkout any version by setting a git tag/sha/branch such as 
+```
+cmake -DKokkos_version=git.4.7.01 -DHeffte_VERSION=git.v2.4.1 ...  
+# or for a very specific version 
+cmake -DHeffte_VERSION=git.9eab7c0eb18e86acaccc2b5699b30e85a9e7bdda ...  
+```
+Note that by default, Kokkos git tags use a format `x.x.xx (eg. 4.7.01)` and Heffte git tags (extra 'v') are of the form `vx.x.x (eg. v2.4.1)`
+
 Furthermore, be aware of `CMAKE_BUILD_TYPE`, which can be either
 - `Release` for optimized builds
 - `RelWithDebInfo` for optimized builds with debug info (default)
@@ -62,6 +97,27 @@ cd ippl
 mkdir build
 cd build
 ```
+#### CMakeUserPresets
+In the root IPPL source folder, there is a cmake user presets file which can be used to set some default cmake settings, they may be used in the following way
+```
+cmake --prefix=release-testing ...
+```
+This will set the following variables automatically (exact values may change over time)
+```
+        "IPPL_ENABLE_TESTS": "ON",
+        "IPPL_ENABLE_UNIT_TESTS": "ON"
+        "BUILD_SHARED_LIBS": "ON",
+        "CMAKE_BUILD_TYPE": "Release",
+        "Kokkos_VERSION_DEFAULT": "4.5.01",
+        "Heffte_VERSION_DEFAULT": "2.4.0",
+        "IPPL_PLATFORMS": "OPENMP;CUDA",
+        "IPPL_ENABLE_FFT": "ON",
+        "IPPL_ENABLE_ALPINE": "ON",
+        "IPPL_ENABLE_COSMOLOGY": "ON",
+        "IPPL_USE_STANDARD_FOLDERS": "OFF"
+```
+Users are encouraged to define additional sets of flags and create presets for them.
+
 #### Serial debug build with tests and newest Kokkos
 ```
 cmake .. \
@@ -82,7 +138,7 @@ cmake .. \
     -DIPPL_PLATFORMS=openmp \
     -DHeffte_ENABLE_FFTW=True
 ```
-#### Cuda alpine release build 
+#### Cuda alpine release build
 ```
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
@@ -90,12 +146,12 @@ cmake .. \
     -DCMAKE_CXX_STANDARD=20 \
     -DIPPL_ENABLE_FFT=ON \
     -DIPPL_ENABLE_TESTS=ON \
-    -DUSE_ALTERNATIVE_VARIANT=ON \
+    -DIPPL_USE_ALTERNATIVE_VARIANT=ON \
     -DIPPL_ENABLE_SOLVERS=ON \
     -DIPPL_ENABLE_ALPINE=True \
     -DIPPL_PLATFORMS=cuda
 ```
-#### HIP release build (LUMI) 
+#### HIP release build (LUMI)
 ```
 cmake .. \
       -DCMAKE_BUILD_TYPE=Release \
@@ -135,7 +191,7 @@ m-6.0.3/lib/llvm/lib"
 # Contributions
 We are open and welcome contributions from others. Please open an issue and a corresponding pull request in the main repository if it is a bug fix or a minor change.
 
-For larger projects we recommend to fork the main repository and then submit a pull request from it. More information regarding github workflow for forks can be found in this [page](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks) and how to submit a pull request from a fork can be found [here](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). Please follow the coding guidelines as mentioned in this [page](https://github.com/IPPL-framework/ippl/blob/master/WORKFLOW.md). 
+For larger projects we recommend to fork the main repository and then submit a pull request from it. More information regarding github workflow for forks can be found in this [page](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks) and how to submit a pull request from a fork can be found [here](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). Please follow the coding guidelines as mentioned in this [page](https://github.com/IPPL-framework/ippl/blob/master/WORKFLOW.md).
 
 You can add an upstream to be able to get all the latest changes from the master. For example, if you are working with a fork of the main repository, you can add the upstream by:
 ```bash
@@ -144,7 +200,7 @@ $ git remote add upstream git@github.com:IPPL-framework/ippl.git
 You can then easily pull by typing
 ```bash
 $ git pull upstream master
-````
+```
 All the contributions (except for bug fixes) need to be accompanied with a unit test. For more information on unit tests in IPPL please
 take a look at this [page](https://github.com/IPPL-framework/ippl/blob/master/UNIT_TESTS.md).
 
@@ -271,6 +327,64 @@ Here we compile links to recipies for easy build on various HPC systems.
 [IPPL build for A100 and HG](https://hpce.pages.psi.ch/merlin7/ippl.html)
 
 ## ALPS (CSCS)
-comming soon
+Start by loading a `uenv` that contains most of the tools we want. Note that in future an `official` uenv will be provided in the CSCS uenv repository, but until testing is complete, use the following ...
 
-Happy building!
+```bash
+uenv start --view=develop \
+/capstor/store/cscs/cscs/csstaff/biddisco/uenvs/opal-x-gh200-mpich-gcc-2025-09-28.squashfs
+```
+or, look for a newer one and pick the one with the latest date in the name using
+```bash
+ls -al /capstor/store/cscs/cscs/csstaff/biddisco/uenvs/opal-x-gh200-*.squashfs
+``` 
+At the time of writing, the uenv provides (as well as many other packages)
+```yaml
+cmake@4.1.1         ~doc+ncurses+ownlibs~qtgui 
+cray-mpich@9.0.0    +cuda+cxi~rocm 
+cuda@12.8.1         ~allow-unsupported-compilers~dev 
+eigen@3.4.0         ~ipo~nightly~rocm 
+fftw@3.3.10         +mpi~openmp~pfft_patches+shared 
+gcc@13.4.0          ~binutils+bootstrap~graphite~mold~nvptx~piclibs+profiled+strip 
+googletest@1.17.0   ~absl+gmock~ipo+pthreads+shared 
+gsl@2.8             ~external-cblas+pic+shared 
+h5hut@master        ~fortran+mpi 
+hdf5@1.14.6         +cxx~fortran+hl~ipo~java~map+mpi+shared~subfiling+szip~threadsafe+tools api=default 
+heffte@2.4.1        +cuda+fftw~fortran~ipo~magma~mkl~python~rocm+shared 
+hpctoolkit@2025.0.1 +cuda~docs~level_zero~mpi~opencl+papi~python~rocm~strip+viewer 
+hwloc@2.11.1        ~cairo~cuda~gl~level_zero~libudev~libxml2~nvml~opencl+pci~rocm 
+kokkos@4.7.00       ~aggressive_vectorization~alloc_async~cmake_lang~compiler_warnings+complex_align+cuda~cuda_constexpr~cuda_lambda~cuda_ldg_intrinsic~cuda_relocatable_device_code~cuda_uvm~debug~debug_bounds_check~debug_dualview_modify_check~deprecated_code~examples~hip_relocatable_device_code~hpx~hpx_async_dispatch~hwloc~ipo~memkind~numactl+openmp~openmptarget~pic~rocm+serial+shared~sycl~tests~threads~tuning+wrapper build_system=cmake build_type=Release cuda_arch=90 cxxstd=20 generator=make intel_gpu_arch=none 
+ninja@1.13.0        +re2c 
+```
+You can check what is inside the uenv by executing the command
+```bash
+# This will show all packages installed by spack (including any ones you might have installed yourself outside of a uenv)
+spack find -flv
+
+# use this to only show packages inside the uenv (ie. not any you have installed elsewhere)
+spack -C /user-environment/config find -flv
+```
+It is important to use the `--view=develop` when loading the uenv as this sets-up the paths to packages in the spack environment ready for you to use them (without needing to manually `spack load xxx` packages individually) (In fact it will also add `/user-environment/env/develop/` to your `CMAKE_PREFIX_PATH`) which makes cmake-built packages 'just work'. 
+
+To build, try the following which uses default CMake settings (`release-testing`) taken from `CMakeUserPresets.json` (in the root ippl source of the cmake-alps branch - it is not required to use this branch, but cmake support has been cleaned up)
+```bash
+ssh daint
+uenv start --view=develop /capstor/scratch/cscs/biddisco/uenvs/gh200-opalxgccmpich-2025-07-23.squashfs
+
+# clone IPPL
+mkdir -p $HOME/src/ippl
+cd $HOME/src
+git clone https://github.com/IPPL-framework/ippl
+
+# (optionally) checkout the cmake-alps branch since it is not yet merged to master
+cd $HOME/src/ippl
+git remote add biddisco https://github.com/biddisco/ippl.git
+git fetch biddisco cmake-alps
+git checkout cmake-alps
+
+# create a build dir
+mkdir -p $HOME/build/ippl
+cd $HOME/build/ippl
+
+# run cmake (note that ninja is available in the uenv and "cmake -G Ninja" can be used)
+cmake --preset=release-testing -DCMAKE_INSTALL_PREFIX=$HOME/apps/ippl -DCMAKE_CUDA_ARCHITECTURES=90 $HOME/src/ippl/
+```
diff --git a/alpine/CMakeLists.txt b/alpine/CMakeLists.txt
index 565731c1a..6c54863d7 100644
--- a/alpine/CMakeLists.txt
+++ b/alpine/CMakeLists.txt
@@ -7,11 +7,11 @@
 add_subdirectory(ExamplesWithoutPicManager)
 
 function(add_alpine_example name)
-    add_executable(${name} ${name}.cpp)
+  add_executable(${name} ${name}.cpp)
 
-    target_link_libraries(${name} PRIVATE ippl::ippl)
+  target_link_libraries(${name} PRIVATE ippl::ippl)
 
-    target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 endfunction()
 
 add_alpine_example(PenningTrap)
diff --git a/alpine/ExamplesWithoutPicManager/CMakeLists.txt b/alpine/ExamplesWithoutPicManager/CMakeLists.txt
index b0ab4b2b5..ab0f3573f 100644
--- a/alpine/ExamplesWithoutPicManager/CMakeLists.txt
+++ b/alpine/ExamplesWithoutPicManager/CMakeLists.txt
@@ -1,16 +1,16 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding examples found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding examples found in ${_relPath}")
 
 # Needed for threading
 find_package(Threads REQUIRED)
 
 # Macro for adding example executables
 function(add_alpine_example name)
-    add_executable(${name} ${name}.cpp)
+  add_executable(${name} ${name}.cpp)
 
-    target_link_libraries(${name} PRIVATE ippl::ippl)
+  target_link_libraries(${name} PRIVATE ippl::ippl)
 
-    target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 endfunction()
 
 # === Add individual examples ===
diff --git a/ci/tests/compile-and-test-juwels.yml b/ci/tests/compile-and-test-juwels.yml
index e60ab0943..24ba5c5e4 100644
--- a/ci/tests/compile-and-test-juwels.yml
+++ b/ci/tests/compile-and-test-juwels.yml
@@ -10,13 +10,13 @@ compile-and-test-juwels:
     SLURM_PARTITION: "develbooster"
     SLURM_TIME: "00:40:00"
     SLURM_CPUS_PER_TASK: "6"
-    CMAKE_BUILD_TYPE: "Release"  
+    CMAKE_BUILD_TYPE: "Release"
     PROJECT_NAME: "hai_1073"
 
     RUN_TESTS: "true" # "true" → run tests; "false" → compile only
-    PLATFORM: "cuda"  # or "openmp"
+    PLATFORM: "cuda" # or "openmp"
     TEST_PROCS: "1" # number of ranks for tests
-    ARCH: "AMPERE80"            
+    ARCH: "AMPERE80"
 
   script: |
     set -Eeuo pipefail
@@ -57,12 +57,13 @@ compile-and-test-juwels:
         -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
         -DIPPL_ENABLE_TESTS=ON \
         -DIPPL_ENABLE_UNIT_TESTS=ON \
+        -DIPPL_SKIP_FAILING_TESTS=ON \
         -DIPPL_DEFAULT_TEST_PROCS="${TEST_PROCS}" \
         -DIPPL_ENABLE_FFT=ON \
         -DIPPL_ENABLE_SOLVERS=ON \
         -DIPPL_ENABLE_ALPINE=ON \
         -DIPPL_ENABLE_EXAMPLES=ON \
-        -DUSE_ALTERNATIVE_VARIANT=ON \
+        -DIPPL_USE_ALTERNATIVE_VARIANT=ON \
         -DIPPL_ENABLE_COSMOLOGY=ON \
         $([ "${ARCH}" != "NONE" ] && echo "-DKokkos_ARCH_${ARCH}=ON") \
         -DIPPL_PLATFORMS="${PLATFORM}"
@@ -133,7 +134,6 @@ compile-and-test-juwels:
     echo "{\"name\": \"${arch} - ${PLATFORM} procs: ${TEST_PROCS}\"}" \
       > "${CTEST_RESULTS_DIR}/context.json"
 
-
 compile-openmp-debug-no-tests:
   extends: compile-and-test-juwels
   variables:
@@ -157,8 +157,8 @@ test-openmp-release-2procs:
     CMAKE_BUILD_TYPE: "Release"
     PLATFORM: "openmp"
     ARCH: "NONE"
-    TEST_PROCS: "2"           
-    SLURM_NTASKS_PER_NODE: "2" 
+    TEST_PROCS: "2"
+    SLURM_NTASKS_PER_NODE: "2"
 
 test-openmp-release-1proc:
   extends: compile-and-test-juwels
@@ -167,7 +167,7 @@ test-openmp-release-1proc:
     CMAKE_BUILD_TYPE: "Release"
     PLATFORM: "openmp"
     ARCH: "NONE"
-    TEST_PROCS: "1"          
+    TEST_PROCS: "1"
     SLURM_NTASKS_PER_NODE: "1"
 
 test-cuda-release-2procs:
@@ -177,6 +177,5 @@ test-cuda-release-2procs:
     CMAKE_BUILD_TYPE: "Release"
     PLATFORM: "cuda"
     ARCH: "AMPERE80"
-    TEST_PROCS: "2"           
-    SLURM_NTASKS_PER_NODE: "2" 
-
+    TEST_PROCS: "2"
+    SLURM_NTASKS_PER_NODE: "2"
diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake
index ca5715bc8..0774d2f81 100644
--- a/cmake/CompilerOptions.cmake
+++ b/cmake/CompilerOptions.cmake
@@ -1,5 +1,6 @@
 # -----------------------------------------------------------------------------
 # CompilerOptions.cmake
+# cmake-format: off
 #
 # Sets compiler flags that affect how all IPPL targets are built.
 #
@@ -12,54 +13,50 @@
 #   - Enabling CUDA/OpenMP/Serial                 → Platforms.cmake
 #   - Selecting platform specific compiler flags  → Platforms.cmake 
 #
-#
 # This file is only concerned with general correctness and development-time safety.
+#
+# cmake-format: on
 # -----------------------------------------------------------------------------
 
-
 # === Basic warnings (apply to all builds) ===
-add_compile_options(
-    -Wall
-    -Wextra
-    -Wno-deprecated-declarations
-)
+add_compile_options(-Wall -Wextra -Wno-deprecated-declarations)
 
 # === Use modified variant implementation ===
-if (USE_ALTERNATIVE_VARIANT)
-    add_definitions (-DUSE_ALTERNATIVE_VARIANT)
+if(IPPL_USE_ALTERNATIVE_VARIANT)
+  add_definitions(-DIPPL_USE_ALTERNATIVE_VARIANT)
 endif()
 
 # === Code coverage options ===
 if(IPPL_ENABLE_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))
-    message(STATUS "${ColorYellow}Code coverage enabled.${ColorReset}")
-    add_compile_options(-fprofile-arcs -ftest-coverage -g)
-    add_link_options(-fprofile-arcs -ftest-coverage)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+  message(STATUS "${ColorYellow}Code coverage enabled.${ColorReset}")
+  add_compile_options(-fprofile-arcs -ftest-coverage -g)
+  add_link_options(-fprofile-arcs -ftest-coverage)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
 endif()
 
 # === Compiler-specific warning suppressions ===
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_compile_options(
-        -Wno-deprecated-copy
-        -Wno-sign-compare
-    )
+  add_compile_options(-Wno-deprecated-copy -Wno-sign-compare)
 endif()
 
 # GCC 12+ false positives for buffer overflows, restrict, etc.
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
-    add_compile_options(
-        -Wno-stringop-overflow
-        -Wno-array-bounds
-        -Wno-restrict
-    )
+  add_compile_options(-Wno-stringop-overflow -Wno-array-bounds -Wno-restrict)
 endif()
 
 # === Debug-specific sanitizers ===
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND IPPL_ENABLE_SANITIZER)
-    message(STATUS "✅ Enabling AddressSanitizer and UBSan for Debug build")
-    add_compile_options(-fsanitize=address,undefined)
-    add_link_options(-fsanitize=address,undefined)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+   AND IPPL_ENABLE_SANITIZER)
+  message(STATUS "✅ Enabling AddressSanitizer and UBSan for Debug build")
+  add_compile_options(-fsanitize=address)
+  add_link_options(-fsanitize=address)
 endif()
 
-message(STATUS "✅ Compiler options configured")
+# === Position Independent Code (PIC) for shared libraries ===
+if(BUILD_SHARED_LIBS)
+  message(STATUS "✅ Enabling Position Independent Code (PIC) for shared libraries")
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  set(CMAKE_LINK_DEPENDS_NO_SHARED true)
+endif()
 
+message(STATUS "✅ Compiler options configured")
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 818147774..b68691b5e 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -1,5 +1,6 @@
 # -----------------------------------------------------------------------------
 # Dependencies.cmake
+# ~~~
 #
 # Resolves third-party libraries: Kokkos and Heffte.
 #
@@ -11,115 +12,297 @@
 #   - Selecting platform backends            → Platforms.cmake
 #   - Enabling compiler flags                → CompilerOptions.cmake
 #   - Version variables or target creation   → Version.cmake / src/
+#
+# ~~~
 # -----------------------------------------------------------------------------
-set(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/.fc-cache")
-set(FETCHCONTENT_UPDATES_DISCONNECTED ON)  # opt out of auto-updates
+set(FETCHCONTENT_BASE_DIR "${PROJECT_BINARY_DIR}/_deps")
+set(FETCHCONTENT_UPDATES_DISCONNECTED ON) # opt out of auto-updates
 set(FETCHCONTENT_QUIET ON)
 
 include(FetchContent)
 
-# === MPI ===
-find_package(MPI REQUIRED COMPONENTS CXX)
-
-# === Kokkos ===
-set(Kokkos_VERSION "4.5.00")
-message(STATUS "🔍 Looking for Kokkos ${Kokkos_VERSION}")
-
-find_package(Kokkos ${Kokkos_VERSION} QUIET)
-if(NOT Kokkos_FOUND)
-    message(STATUS "📥 Kokkos not found — using FetchContent")
-    FetchContent_Declare(
-        kokkos
-        URL https://github.com/kokkos/kokkos/archive/refs/tags/${Kokkos_VERSION}.tar.gz
-        DOWNLOAD_EXTRACT_TIMESTAMP ON
-    )
-    set(Kokkos_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
-    set(Kokkos_ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(kokkos)
-endif()
+# ------------------------------------------------------------------------------
+# MPI
+# ------------------------------------------------------------------------------
+find_package(MPI COMPONENTS CXX REQUIRED)
+colour_message(STATUS ${Green} "✅ MPI found ${MPI_CXX_VERSION}")
 
-message(STATUS "✅ Kokkos ready")
+# ------------------------------------------------------------------------------
+# CUDA
+# ------------------------------------------------------------------------------
+if("CUDA" IN_LIST IPPL_PLATFORMS)
+  find_package(CUDAToolkit REQUIRED)
+  colour_message(STATUS ${Green}
+                 "✅ CUDA platform requested and CUDAToolkit found ${CUDAToolkit_VERSION}")
+endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(Heffte_ENABLE_AVX2 OFF CACHE BOOL "" FORCE)
-    message(STATUS "❗ Disabling AVX2 and CUDA in Debug build")
+# ------------------------------------------------------------------------------
+# OpenMP
+# ------------------------------------------------------------------------------
+if("OPENMP" IN_LIST IPPL_PLATFORMS)
+  find_package(OpenMP REQUIRED)
+  colour_message(STATUS ${Green} "✅ OpenMP platform requested OpenMP found ${OPENMP_VERSION}")
 endif()
 
-# === Heffte (only if FFT enabled) ===
-if(IPPL_ENABLE_FFT)
-    add_compile_definitions(IPPL_ENABLE_FFT)
+# ------------------------------------------------------------------------------
+# Utility function to clear a list of vars one by one
+# ------------------------------------------------------------------------------
+function(unset_vars)
+  foreach(VAR IN LISTS ARGN)
+    unset(${VAR} PARENT_SCOPE)
+  endforeach()
+endfunction()
 
-    # Prefer a preinstalled package first
-    if(NOT DEFINED Heffte_VERSION)
-      set(Heffte_VERSION "master")
-    endif()
+# ------------------------------------------------------------------------------
+# Utility function to get git tag/sha/version from version string
+# ------------------------------------------------------------------------------
+function(extract_git_label VERSION_STRING RESULT_VAR)
+  if("${${VERSION_STRING}}" MATCHES "^git\\.(.+)$")
+    set(${RESULT_VAR} "${CMAKE_MATCH_1}" PARENT_SCOPE)
+  else()
+    unset(${RESULT_VAR} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# ------------------------------------------------------------------------------
+# Utility function to get git tags from a repo before downloading (unused currently)
+# ------------------------------------------------------------------------------
+function(get_git_tags GIT_REPOSITORY RESULT_VAR)
+  message("Fetching git tags for repo ${GIT_REPOSITORY}")
+  execute_process(
+    COMMAND git -c versionsort.suffix=- ls-remote --tags --sort=v:refname ${GIT_REPOSITORY}
+    COMMAND cut --delimiter=/ --fields=3
+    COMMAND grep -Po "^[\\d.]+$"
+    OUTPUT_VARIABLE GIT_TAGS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    # Try to find a preinstalled Heffte first.
-    # Accept both package names: Heffte / heffte.
-    set(_heffte_pkg_names Heffte heffte)
-    if(Heffte_VERSION MATCHES "^[0-9]+(\\.[0-9]+)*$")
-      find_package(Heffte ${Heffte_VERSION} CONFIG QUIET NAMES ${_heffte_pkg_names})
+  # Convert the output string into a CMake list
+  string(REPLACE "\n" ";" GIT_TAGS_LIST "${GIT_TAGS}")
+  set(${RESULT_VAR} "${GIT_TAGS_LIST}" PARENT_SCOPE)
+endfunction()
+
+# -----------------------------------------------------------------------------
+# ~~~
+# utility function to set kokkos options
+# NB. We only set these options if we are building Kokkos from source.
+# ~~~
+# -----------------------------------------------------------------------------
+function(set_kokkos_options)
+  foreach(platform ${IPPL_SUPPORTED_PLATFORMS})
+    if(platform IN_LIST IPPL_PLATFORMS)
+      set(Kokkos_ENABLE_${platform} ON CACHE BOOL "Enable Kokkos ${platform} backend" FORCE)
     else()
-      find_package(Heffte CONFIG QUIET NAMES ${_heffte_pkg_names})
+      set(Kokkos_ENABLE_${platform} OFF CACHE BOOL "Disable Kokkos ${platform} backend" FORCE)
     endif()
+    message(STATUS "IPPL_PLATFORM set: Kokkos_ENABLE_${platform} '${Kokkos_ENABLE_${platform}}'")
 
+    if(${platform} STREQUAL "HIP" AND platform IN_LIST IPPL_PLATFORMS)
+      if(NOT DEFINED CMAKE_HIP_ARCHITECTURES)
+        message(FATAL_ERROR "HIP platform requested but CMAKE_HIP_ARCHITECTURES not set")
+      endif()
+    endif()
+  endforeach()
 
-    if(NOT Heffte_FOUND)
-      message(STATUS "📦 Heffte ${Heffte_VERSION} not found — fetching")
-    if(Heffte_VERSION STREQUAL "master")
-      set(_heffte_repo GIT_REPOSITORY https://github.com/icl-utk-edu/heffte.git)
-      set(_heffte_tag  GIT_TAG 9eab7c0eb18e86acaccc2b5699b30e85a9e7bdda)
-    else()
-      unset(_heffte_repo)
-      set(_heffte_tag  URL https://github.com/icl-utk-edu/heffte/archive/refs/tags/v${Heffte_VERSION}.tar.gz)
+  if("CUDA" IN_LIST IPPL_PLATFORMS)
+    set(Kokkos_ENABLE_CUDA_LAMBDA ON)
+  endif()
+
+  if("HIP" IN_LIST IPPL_PLATFORMS)
+    if(IPPL_ENABLE_HIP_PROFILER)
+      set(KOKKOS_ENABLE_PROFILING ON CACHE BOOL "Enable Kokkos Profiling" FORCE)
+      set(Kokkos_ENABLE_LIBDL ON CACHE BOOL "Enable LIBDL" FORCE)
     endif()
-    set(Heffte_ENABLE_AVX2 ON CACHE BOOL "Use AVX2 backend in Heffte" FORCE)
-    set(Heffte_ENABLE_FFTW OFF CACHE BOOL "Use FFTW in Heffte" FORCE)
-    set(Heffte_ENABLE_CUDA OFF CACHE BOOL "Use CUDA in Heffte" FORCE)
-  
-    FetchContent_Declare(heffte
-      ${_heffte_repo}
-      ${_heffte_tag}
-      DOWNLOAD_EXTRACT_TIMESTAMP ON
-    )
-
-    FetchContent_MakeAvailable(heffte)
-
-    # Some builds export 'Heffte' target instead of a namespaced one
-    if(TARGET Heffte AND NOT TARGET Heffte::heffte)
-      add_library(Heffte::heffte ALIAS Heffte)
-      message(STATUS "🔗 Created ALIAS Heffte::heffte for Heffte target.")
+  endif()
+endfunction()
+
+# -----------------------------------------------------------------------------
+# ~~~
+# utility function to set heffte options
+# NB. We only set these options if we are building Heffte from source.
+# ~~~
+# -----------------------------------------------------------------------------
+function(set_heffte_options)
+  if("SERIAL" IN_LIST IPPL_PLATFORMS)
+    set(Heffte_ENABLE_AVX2 ON CACHE BOOL "Enable AVX2 backend for Heffte" FORCE)
+  endif()
+
+  if("OPENMP" IN_LIST IPPL_PLATFORMS)
+    set(Heffte_ENABLE_AVX2 ON CACHE BOOL "Use Heffte Stock backend with AVX2" FORCE)
+  endif()
+
+  if(IPPL_ENABLE_FFT)
+    set(Heffte_ENABLE_FFTW ON)
+    if("CUDA" IN_LIST IPPL_PLATFORMS)
+      set(Heffte_ENABLE_CUDA ON CACHE BOOL "Enable Heffte CUDA backend" FORCE)
+    else()
+      set(Heffte_ENABLE_CUDA OFF CACHE BOOL "Disable Heffte CUDA backend" FORCE)
     endif()
+  endif()
+
+  if("HIP" IN_LIST IPPL_PLATFORMS)
+    set(Heffte_ENABLE_ROCM ON CACHE BOOL "Set Heffte ROCM Backend" FORCE)
+  endif()
+
+  if(NOT DEFINED Heffte_ENABLE_FFTW AND NOT DEFINED Heffte_ENABLE_CUDA AND NOT DEFINED
+                                                                           Heffte_ENABLE_MKL)
+    set(Heffte_ENABLE_AVX2 ON)
+    set(Heffte_ENABLE_FFTW OFF)
+    set(Heffte_ENABLE_CUDA OFF)
+  endif()
 
-    if(NOT TARGET Heffte::heffte)
-      message(FATAL_ERROR "❌ Heffte::heffte target is missing. Check Heffte build configuration.")
+  if(NOT DEFINED Heffte_ENABLE_FFTW)
+    set(Heffte_ENABLE_FFTW OFF CACHE BOOL "Enable FFTW in Heffte" FORCE)
+  endif()
+
+endfunction()
+
+# ------------------------------------------------------------------------------
+# cmake-format: off
+# Kokkos:
+# Use an installed kokkos of version Kokkos_VERSION (or better) if available, except 
+#   * if the user has requested a version that starts with "git.(tag/branch/sha)" 
+#   * if the requested version is not found on the system
+#   * if the requested version is found but doesn't have the backends/platforms we need
+# then build from source. 
+# We use FIND_PACKAGE_ARGS (cmake 3.24+) to allow FetchContent to find a system version
+# cmake-format: on
+# ------------------------------------------------------------------------------
+# set the default version of kokkos we will ask for if not already set
+if(NOT Kokkos_VERSION_DEFAULT)
+  set(Kokkos_VERSION_DEFAULT 4.7.01)
+endif()
+# if the user has not asked for a specific version, we will use a default
+if(NOT Kokkos_VERSION)
+  set(Kokkos_VERSION ${Kokkos_VERSION_DEFAULT})
+endif()
+
+# does version use git tag/branch/sha syntax
+extract_git_label(Kokkos_VERSION KOKKOS_VERSION_GIT)
+set(Kokkos_REPOSITORY "https://github.com/kokkos/kokkos.git")
+if(NOT KOKKOS_VERSION_GIT)
+  find_package(Kokkos ${Kokkos_VERSION} QUIET COMPONENTS ${IPPL_PLATFORMS})
+endif()
+
+# If Kokkos found on system, Check that it has the platform backends that we need
+if(Kokkos_FOUND)
+  colour_message(STATUS ${Green} "✅ Kokkos ${Kokkos_VERSION} found externally")
+  set(KOKKOS_PLATFORM_OK TRUE)
+  foreach(PLATFORM ${IPPL_PLATFORMS})
+    kokkos_check(DEVICES "${PLATFORM}" RETURN_VALUE PLATFORM_OK)
+    if(NOT PLATFORM_OK)
+      colour_message(
+        FATAL_ERROR ${Red} "❌ Kokkos does not have backend:${PLATFORM}, but IPPL requested it\n"
+        "use -DKokkos_VERSION=git.xxx (tag/branch/sha) (eg -DKokkos_VERSION=git.4.7.01)")
+    else()
+      colour_message(STATUS ${Green} "✅ Kokkos has backend: ${PLATFORM}")
     endif()
+  endforeach()
+else()
+  # Define options BEFORE calling MakeAvailable
+  colour_message(STATUS ${Green} "✅ Kokkos ${KOKKOS_VERSION_GIT} building from source")
+  set_kokkos_options()
+  # Invoke cmake fetch/find
+  FetchContent_Declare(Kokkos GIT_TAG ${KOKKOS_VERSION_GIT} GIT_REPOSITORY ${Kokkos_REPOSITORY})
+  FetchContent_MakeAvailable(Kokkos)
+
+  # get_git_tags(${Kokkos_REPOSITORY} KOKKOS_GIT_TAGS) if(NOT Kokkos_VERSION IN_LIST
+  # KOKKOS_GIT_TAGS) message( FATAL_ERROR "Requested Kokkos version ${Kokkos_VERSION} not a known
+  # git tag, please use one of these:\n" "${KOKKOS_GIT_TAGS}") endif()
+endif()
+
+# ------------------------------------------------------------------------------
+# ~~~
+# Heffte (only if FFT enabled)
+# Use find_package(...) with a minimum version requested,
+# except:
+# - if the user has requested a version that starts with "git.(tag/branch/sha)"
+# - if the requested version is not found on the system
+# - if the requested version is found but doesn't have the features we requested
+# ------------------------------------------------------------------------------
+if(IPPL_ENABLE_FFT)
+  add_compile_definitions(IPPL_ENABLE_FFT)
+  option(Heffte_ENABLE_GPU_AWARE_MPI "Is an issue ... " OFF)
+
+  # set the default version of Heffte we will ask for if not already set
+  if(NOT Heffte_VERSION_DEFAULT)
+    set(Heffte_VERSION_DEFAULT 2.4.0)
+  endif()
+  # if the user has not asked for a particular version, we will use the default
+  if(NOT Heffte_VERSION)
+    # default is "git.9eab7c0eb18e86acaccc2b5699b30e85a9e7bdda", spack installed
+    # heffte@git.9eab7c0eb18e86acaccc2b5699b30e85a9e7bdda returns 2.4.0
+    set(Heffte_VERSION ${Heffte_VERSION_DEFAULT})
+  endif()
 
+  # is Heffte_VERSION a git tag/branch/sha
+  extract_git_label(Heffte_VERSION HEFFTE_VERSION_GIT)
+  set(Heffte_REPOSITORY "https://github.com/icl-utk-edu/heffte.git")
+  if(NOT HEFFTE_VERSION_GIT)
+    find_package(Heffte ${Heffte_VERSION} QUIET)
+  endif()
 
-    message(STATUS "✅ Heffte ready (fetched: ${Heffte_VERSION})")
+  if(Heffte_FOUND)
+    colour_message(STATUS ${Green} "✅ Heffte ${Heffte_VERSION} found externally")
+    set(HEFFTE_OK TRUE)
+    if("CUDA" IN_LIST IPPL_PLATFORMS AND NOT Heffte_CUDA_FOUND)
+      set(HEFFTE_OK FALSE)
+    endif()
+    if(IPPL_ENABLE_FFTW AND NOT Heffte_FFTW_FOUND)
+      set(HEFFTE_OK FALSE)
+    endif()
+    if(NOT HEFFTE_OK)
+      colour_message(
+        FATAL_ERROR
+        ${Red}
+        "❌ Heffte found but Heffte_CUDA_FOUND=${Heffte_CUDA_FOUND} and Heffte_FFTW_FOUND=${Heffte_FFTW_FOUND}\n"
+        "use -DHeffte_VERSION=git.xxx (tag/branch/sha), (eg -DHeffte_VERSION=git.v2.4.1)")
+    endif()
   else()
-    message(STATUS "✅ Found preinstalled Heffte ${Heffte_VERSION}")
+    # Define options BEFORE calling MakeAvailable
+    colour_message(STATUS ${Green} "✅ Heffte ${Heffte_VERSION} building from source")
+    set_heffte_options()
+    set(heffte_fetch GIT_TAG ${HEFFTE_VERSION_GIT} GIT_REPOSITORY
+                     https://github.com/icl-utk-edu/heffte.git DOWNLOAD_EXTRACT_TIMESTAMP ON)
+    # Invoke cmake fetch/find
+    FetchContent_Declare(Heffte ${heffte_fetch})
+    FetchContent_MakeAvailable(Heffte)
+  endif()
+
+  if(Heffte_ENABLE_FFTW AND NOT Heffte_ENABLE_FFTW)
+    colour_message(WARNING ${Red} "Heffte NOT FFTW enabled but IPPL FFTW requested")
+  endif()
+
+  if(TARGET Heffte AND NOT TARGET Heffte::Heffte)
+    add_library(Heffte::Heffte ALIAS Heffte)
+    message(STATUS "🔗 Created ALIAS Heffte::Heffte for Heffte target.")
   endif()
 endif()
 
+# ------------------------------------------------------------------------------
+# GoogleTest
+# ------------------------------------------------------------------------------
 if(IPPL_ENABLE_UNIT_TESTS)
-  find_package(GTest CONFIG QUIET)
-
+  find_package(GTest)
   if(NOT GTest_FOUND)
-    message(STATUS "📥 GoogleTest not found — fetching")
+    FetchContent_Declare(GTest GIT_REPOSITORY "https://github.com/google/googletest"
+                         GIT_TAG "v1.16.0" GIT_SHALLOW ON)
 
-    FetchContent_Declare(
-        googletest
-        URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
-        DOWNLOAD_EXTRACT_TIMESTAMP ON
-    )
+    # For Windows: force shared crt, ignored on linux
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
     # Turn off GTest install/tests in the subproject
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # harmless on non-MSVC
     set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
     set(BUILD_GTEST ON CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(googletest)
+
+    FetchContent_MakeAvailable(GTest)
+    message(STATUS "✅ GoogleTest built from source (${GTest_VERSION})")
   endif()
-  message(STATUS "✅ GoogleTest ready")
+endif()
+
+if(IPPL_ENABLE_TESTS)
+  set(DOWNLOADED_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloaded_headers")
+  file(DOWNLOAD https://raw.githubusercontent.com/manuel5975p/stb/master/stb_image_write.h
+       "${DOWNLOADED_HEADERS_DIR}/stb_image_write.h")
+  message(STATUS "✅ stb_image_write loaded for testing FDTD solver.")
 endif()
diff --git a/cmake/FailingTests.cmake b/cmake/FailingTests.cmake
new file mode 100644
index 000000000..11d96eba4
--- /dev/null
+++ b/cmake/FailingTests.cmake
@@ -0,0 +1,33 @@
+# -----------------------------------------------------------------------------
+# FailingTests.cmake
+#
+# Maintains a list of tests that are excluded from testing due to the fact that they are known to
+# fail and spoil an otherwise green dashboard.
+#
+# Fixing these tests should be considered a priority
+#
+# -----------------------------------------------------------------------------
+
+if(BUILD_TESTING AND IPPL_SKIP_FAILING_TESTS)
+  set(IPPL_DISABLED_TEST_LIST
+      AssembleRHS
+      InterpolateDiracs
+      ParticleSendRecv
+      ORB
+      PIC
+      TestSolverDesign
+      TestGaussian_convergence
+      TestSphere
+      Budiardja_plot
+      TestGaussian
+      TestGaussian_hessian
+      TestFFTTruncatedGreenPeriodicPoissonSolver
+      TestScaling_ZeroBC_sin
+      TestScaling_PeriodicBC_sinsin
+      TestMaxwellDiffusionZeroBC
+      TestMaxwellDiffusionPolyZeroBC
+      TestMaxwellDiffusionPolyZeroBCTimed
+      TestScaling_ZeroBC_sin_precon
+      TestScaling_PeriodicBC_sinsin_precon
+      TestNonStandardFDTDSolver_convergence)
+endif()
diff --git a/cmake/IPPLConfig.cmake.in b/cmake/IPPLConfig.cmake.in
index 1a8cac94d..e11a64d58 100644
--- a/cmake/IPPLConfig.cmake.in
+++ b/cmake/IPPLConfig.cmake.in
@@ -2,11 +2,78 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(Kokkos CONFIG REQUIRED)
 find_dependency(MPI REQUIRED)
 
+# -----------------------------------------------------------------------------
+# To support FetchContent downloaded kokkos/heffte:
+# Detect if this file is being sourced from build tree or install tree
+# -----------------------------------------------------------------------------
+get_filename_component(_ipplconfig_dir "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
+get_filename_component(_build_dir       "@CMAKE_BINARY_DIR@"       REALPATH)
+get_filename_component(_install_dir     "@CMAKE_INSTALL_PREFIX@"   REALPATH)
+if(_ipplconfig_dir MATCHES "^${_install_dir}")
+    set(_INSTALL_TREE 1)
+elseif(_ipplconfig_dir MATCHES "^${_build_dir}")
+    set(_BUILD_TREE 1)
+endif()
+
+# -----------------------------------------------------------------------------
+# Kokkos
+# -----------------------------------------------------------------------------
+# "Kokkos_FOUND" is set when IPPL is configured if an external Kokkos was found
+if (@Kokkos_FOUND@)
+    message(STATUS "Finding IPPL dependency : external Kokkos")
+    set(Kokkos_DIR @Kokkos_DIR@)
+    find_dependency(Kokkos REQUIRED)
+else()
+    # Kokkos was built "in-tree" via FetchContent
+    # we will instruct cmake to find Kokkos either in build or install tree 
+    if(_INSTALL_TREE)
+        set(Kokkos_ROOT "${_install_dir}")
+        find_dependency(Kokkos REQUIRED)
+        message(STATUS "Using Kokkos_ROOT in the ippl install tree ${_install_dir}")
+    elseif(_BUILD_TREE)
+        set(Kokkos_ROOT "${_build_dir}")
+        message(FATAL_ERROR 
+            "You are using IPPL directly from the IPPL build tree with Kokkos compiled from source "
+            "(inside the IPPL tree). "
+            "CMake can't find correctly find Kokkos unless it has been 'installed', so please use an "
+            "install tree of IPPL (where Kokkos will also be installed")
+    else()
+        message(FATAL_ERROR "IPPLConfig.cmake location does not match IPPL build or install tree")
+    endif()
+endif()
+message(STATUS "Kokkos found version ${Kokkos_VERSION} ${Kokkos_DIR}")
+
+# -----------------------------------------------------------------------------
+# Heffte
+# -----------------------------------------------------------------------------
 if(@IPPL_ENABLE_FFT@)
-  find_dependency(Heffte CONFIG REQUIRED)
+    if (@Heffte_FOUND@)
+        message(STATUS "Finding IPPL dependency : external Heffte")
+        set(Heffte_DIR @Heffte_DIR@)
+        find_dependency(Heffte REQUIRED)
+    else()
+        # Heffte was built "in-tree" via FetchContent
+        # we will instruct cmake to find Heffte either in build or install tree 
+        if(_INSTALL_TREE)
+            set(Heffte_ROOT "${_install_dir}")
+            find_dependency(Heffte REQUIRED)
+            message(STATUS "Using Heffte_ROOT in the ippl install tree ${_install_dir}")
+        elseif(_BUILD_TREE)
+            set(Heffte_ROOT "${_build_dir}")
+            message(FATAL_ERROR 
+                "You are using IPPL from the build tree with IPPL-compiled Heffte "
+                "CMake can't find correctly find Heffte, so please use an install tree of IPPL/Heffte")
+        else()
+            message(FATAL_ERROR "IPPLConfig.cmake location does not match IPPL build or install tree")
+        endif()
+    endif()
+    message(STATUS "Heffte found version ${Heffte_VERSION} ${Heffte_DIR}")
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/ipplTargets.cmake")
+# -----------------------------------------------------------------------------
+# MAke sure IPPL targets are setup
+# -----------------------------------------------------------------------------
+include("${CMAKE_CURRENT_LIST_DIR}/IPPLTargets.cmake")
+
diff --git a/cmake/InstallIppl.cmake b/cmake/InstallIppl.cmake
index fd03cff59..2c7536c45 100644
--- a/cmake/InstallIppl.cmake
+++ b/cmake/InstallIppl.cmake
@@ -3,70 +3,124 @@
 # Installation logic for the IPPL library
 # -------------------------------------------------------
 
-set(IPPL_INSTALL_CMAKEDIR
-    "${CMAKE_INSTALL_LIBDIR}/cmake/ippl"
+set(IPPL_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/ippl"
     CACHE PATH "Directory for ippl CMake package files")
 
 set(_ippl_install_excludes
-  PATTERN "CMakeFiles"     EXCLUDE
-  PATTERN "CMakeLists.txt" EXCLUDE
-  PATTERN "*.c"            EXCLUDE
-  PATTERN "*.cc"           EXCLUDE
-  PATTERN "*.cpp"          EXCLUDE
-  PATTERN "*.cu"           EXCLUDE
-)
+    PATTERN
+    "CMakeFiles"
+    EXCLUDE
+    PATTERN
+    "CMakeLists.txt"
+    EXCLUDE
+    PATTERN
+    "*.c"
+    EXCLUDE
+    PATTERN
+    "*.cc"
+    EXCLUDE
+    PATTERN
+    "*.cpp"
+    EXCLUDE
+    PATTERN
+    "*.cu"
+    EXCLUDE)
 if(NOT IPPL_ENABLE_FFT)
-  list(APPEND _ippl_install_excludes
-    PATTERN "FFT/*"                    EXCLUDE
-    PATTERN "PoissonSolvers/FFT*"      EXCLUDE  # match your filenames if needed
+  list(
+    APPEND
+    _ippl_install_excludes
+    PATTERN
+    "FFT/*"
+    EXCLUDE
+    PATTERN
+    "PoissonSolvers/FFT*"
+    EXCLUDE # match your filenames if needed
   )
 endif()
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ippl
-        FILES_MATCHING
-          PATTERN "*.h"   PATTERN "*.hpp"   PATTERN "*.hh"   PATTERN "*.H"
-          PATTERN "*.cuh" PATTERN "*.tpp"
-          ${_ippl_install_excludes})
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ippl
+  FILES_MATCHING
+  PATTERN "*.h"
+  PATTERN "*.hpp"
+  PATTERN "*.hh"
+  PATTERN "*.H"
+  PATTERN "*.cuh"
+  PATTERN "*.tpp" ${_ippl_install_excludes})
 
-install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/IpplVersions.h
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/IpplVersions.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # Install the actual library target
-install(TARGETS ippl
-    EXPORT ipplTargets
-    ARCHIVE     DESTINATION ${CMAKE_INSTALL_LIBDIR}     # static libs, import libs
-    LIBRARY     DESTINATION ${CMAKE_INSTALL_LIBDIR}     # shared libs
-    RUNTIME     DESTINATION ${CMAKE_INSTALL_BINDIR}     # executables (if any)
-    INCLUDES    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+install(
+  TARGETS ippl
+  EXPORT ipplTargets
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # static libs, import libs
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # shared libs
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # executables (if any)
+  INCLUDES
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # Export the CMake target for find_package()
-install(EXPORT ipplTargets
-    FILE ipplTargets.cmake
-    NAMESPACE ippl::
-    DESTINATION ${IPPL_INSTALL_CMAKEDIR}
-)
+install(EXPORT ipplTargets FILE ipplTargets.cmake NAMESPACE ippl::
+        DESTINATION ${IPPL_INSTALL_CMAKEDIR})
 
 include(CMakePackageConfigHelpers)
 
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfigVersion.cmake"
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY SameMajorVersion
-)
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/IPPLConfigVersion.cmake"
+                                 VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion)
 
 configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/cmake/IPPLConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfig.cmake"
-    INSTALL_DESTINATION ${IPPL_INSTALL_CMAKEDIR}
-)
+  "${PROJECT_SOURCE_DIR}/cmake/IPPLConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfig.cmake"
+  INSTALL_DESTINATION ${IPPL_INSTALL_CMAKEDIR})
 
-install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfigVersion.cmake"
-    DESTINATION ${IPPL_INSTALL_CMAKEDIR}
-)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfig.cmake"
+              "${CMAKE_CURRENT_BINARY_DIR}/IPPLConfigVersion.cmake"
+        DESTINATION ${IPPL_INSTALL_CMAKEDIR})
 
+return()
+
+# cmake/InstallIppl.cmake
+# -------------------------------------------------------
+# Installation logic for the IPPL library
+# -------------------------------------------------------
+include(CMakePackageConfigHelpers)
+
+# -------------------------------------------------------
+# Install public headers
+install(FILES ${IPPL_SOURCE_DIR}/Ippl.h ${IPPL_SOURCE_DIR}/IpplCore.h
+              ${IPPL_BINARY_DIR}/IpplVersions.h DESTINATION include)
+
+# -------------------------------------------------------
+# Install the actual library target
+install(TARGETS ippl EXPORT IpplTargets DESTINATION lib)
+
+# Ensure extern dependencies (like HEFFTE) are exported correctly if they were built in-tree. This
+# is necessary for Heffte because it does not use CMake's export target mechanism
+if(TARGET Heffte)
+  install(TARGETS Heffte EXPORT IpplTargets DESTINATION lib)
+endif()
+
+# -------------------------------------------------------
+# Export the CMake targets for find_package()
+install(EXPORT IpplTargets FILE IPPLTargets.cmake NAMESPACE IPPL:: DESTINATION lib/cmake/IPPL)
+
+# -------------------------------------------------------
+# Also export targets to the build directory to support uninstalled builds
+export(EXPORT IpplTargets FILE "${PROJECT_BINARY_DIR}/IPPLTargets.cmake" NAMESPACE IPPL::)
+
+# -------------------------------------------------------
+# generate a version file for the package (in the build tree)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/IPPLConfigVersion.cmake"
+                                 VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion)
+
+# -------------------------------------------------------
+# generate a package config file (in the build tree)
+configure_package_config_file(
+  "${PROJECT_SOURCE_DIR}/cmake/IPPLConfig.cmake.in" "${PROJECT_BINARY_DIR}/IPPLConfig.cmake"
+  INSTALL_DESTINATION lib/cmake/IPPL)
+
+# -------------------------------------------------------
+# install the generated version and package config files in the install tree
+install(FILES "${PROJECT_BINARY_DIR}/IPPLConfig.cmake"
+              "${PROJECT_BINARY_DIR}/IPPLConfigVersion.cmake" DESTINATION lib/cmake/IPPL)
diff --git a/cmake/Messages.cmake b/cmake/Messages.cmake
new file mode 100644
index 000000000..5e274d7e4
--- /dev/null
+++ b/cmake/Messages.cmake
@@ -0,0 +1,47 @@
+# -----------------------------------------------------------------------------
+# Messages.cmake
+#
+# This file is responsible for messages macros, color and debug.
+#
+# It should be included near the top of the top-level CMakeLists.txt.
+# -----------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# OS specific settings for terminal colour
+# ------------------------------------------------------------------------------
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(ColourReset "${Esc}[m")
+  set(Black "${Esc}[30m")
+  set(Red "${Esc}[31m")
+  set(Green "${Esc}[32m")
+  set(Yellow "${Esc}[33m")
+  set(Blue "${Esc}[34m")
+  set(Magenta "${Esc}[35m")
+  set(Cyan "${Esc}[36m")
+  set(Light_Gray "${Esc}[37m")
+  set(Gray "${Esc}[90m")
+  set(Light_Red "${Esc}[91m")
+  set(Light_Green "${Esc}[92m")
+  set(Light_Yellow "${Esc}[93m")
+  set(Light_Blue "${Esc}[94m")
+  set(Light_Magenta "${Esc}[95m")
+  set(Light_Cyan "${Esc}[96m")
+  set(White "${Esc}[97m")
+endif()
+
+# ------------------------------------------------------------------------------
+# Coloured message
+# ------------------------------------------------------------------------------
+macro(colour_message TYPE COLOUR message)
+  message("${TYPE}" "${COLOUR}${message}${ColourReset}")
+endmacro()
+
+# ------------------------------------------------------------------------------
+# Debug message
+# ------------------------------------------------------------------------------
+function(debug_message DEBUG message)
+  if(${DEBUG})
+    colour_message(STATUS "${Light_Green}" "DEBUG: ${message}")
+  endif()
+endfunction()
diff --git a/cmake/PlatformOptions.cmake b/cmake/PlatformOptions.cmake
index a08768385..7b03922de 100644
--- a/cmake/PlatformOptions.cmake
+++ b/cmake/PlatformOptions.cmake
@@ -9,22 +9,19 @@ set(TimerFences true)
 
 # Determine from Kokkos device list if available
 if(Kokkos_DEVICES)
-    string(REPLACE ";SERIAL" "" KokkosAccelerators "${Kokkos_DEVICES}")
-    string(REPLACE "SERIAL;" "" KokkosAccelerators "${KokkosAccelerators}")
+  string(REPLACE ";SERIAL" "" KokkosAccelerators "${Kokkos_DEVICES}")
+  string(REPLACE "SERIAL;" "" KokkosAccelerators "${KokkosAccelerators}")
 
-    if("${KokkosAccelerators}" MATCHES ".+;.+")
-        set(TimerFences false)
-        message(STATUS "⏱️  Multiple Kokkos devices detected (${Kokkos_DEVICES}) — disabling timer fences.")
-    else()
-        message(STATUS "⏱️  Single Kokkos device detected (${Kokkos_DEVICES}) — enabling timer fences.")
-    endif()
+  if("${KokkosAccelerators}" MATCHES ".+;.+")
+    set(TimerFences false)
+    message(
+      STATUS "⏱️  Multiple Kokkos devices detected (${Kokkos_DEVICES}) — disabling timer fences.")
+  else()
+    message(STATUS "⏱️  Single Kokkos device detected (${Kokkos_DEVICES}) — enabling timer fences.")
+  endif()
 else()
-    message(STATUS "⏱️  Kokkos_DEVICES not set — defaulting to TimerFences = true.")
+  message(STATUS "⏱️  Kokkos_DEVICES not set — defaulting to TimerFences = true.")
 endif()
 
 # Define macro for use in source code
-target_compile_definitions(ippl
-    PUBLIC
-        IPPL_ENABLE_TIMER_FENCES=${TimerFences}
-)
-
+target_compile_definitions(ippl PUBLIC IPPL_ENABLE_TIMER_FENCES=${TimerFences})
diff --git a/cmake/Platforms.cmake b/cmake/Platforms.cmake
index 2fcb4d77a..538f8ba3b 100644
--- a/cmake/Platforms.cmake
+++ b/cmake/Platforms.cmake
@@ -1,5 +1,6 @@
 # -----------------------------------------------------------------------------
 # Platforms.cmake
+# ~~~
 #
 # Handles platform/backend selection for IPPL: SERIAL, OPENMP, CUDA, or CUDA + OPENMP.
 #
@@ -10,77 +11,69 @@
 #
 # Not responsible for:
 #   - Selecting default CMake build type    → ProjectSetup.cmake
+#
+# ~~~
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# platforms we do support
 # -----------------------------------------------------------------------------
+set(IPPL_SUPPORTED_PLATFORMS "SERIAL;OPENMP;CUDA;HIP")
 
 # === Default to SERIAL if IPPL_PLATFORMS not set ===
 if(NOT IPPL_PLATFORMS)
-    set(IPPL_PLATFORMS "SERIAL")
-    message(STATUS "No IPPL_PLATFORMS specified — defaulting to SERIAL")
+  set(IPPL_PLATFORMS "SERIAL")
+  message(STATUS "No IPPL_PLATFORMS specified — defaulting to SERIAL")
 endif()
 
 # === Normalize to uppercase ===
 string(TOUPPER "${IPPL_PLATFORMS}" IPPL_PLATFORMS)
 
-# === Handle known platform combinations ===
-if("${IPPL_PLATFORMS}" STREQUAL "SERIAL")
-    set(Kokkos_ENABLE_SERIAL ON CACHE BOOL "Enable Kokkos Serial backend" FORCE)
-    set(Heffte_ENABLE_AVX2 ON CACHE BOOL "Enable AVX2 backend for Heffte" FORCE)
-    message(STATUS "🧩 Backend: SERIAL")
-
-elseif("${IPPL_PLATFORMS}" STREQUAL "OPENMP")
-    set(Kokkos_ENABLE_OPENMP ON CACHE BOOL "Enable Kokkos OpenMP backend" FORCE)
-    set(Heffte_ENABLE_AVX2 ON CACHE BOOL "Use Heffte Stock backend with AVX2" FORCE)
-    message(STATUS "🧩 Backend: OPENMP")
-
-elseif("${IPPL_PLATFORMS}" STREQUAL "CUDA")
-    set(Kokkos_ENABLE_CUDA ON CACHE BOOL "Enable Kokkos CUDA backend" FORCE)
-    set(Heffte_ENABLE_CUDA ON CACHE BOOL "Enable Heffte CUDA backend" FORCE)
-    message(STATUS "🧩 Backend: CUDA")
-
-elseif("${IPPL_PLATFORMS}" STREQUAL "HIP")
-    set(Heffte_ENABLE_ROCM ON CACHE BOOL "Set Heffte ROCM Backend" FORCE)
-    set(Kokkos_ENABLE_HIP ON CACHE BOOL "Enable Kokkos HIP Backend" FORCE)
-    message(STATUS "🧩 Backend: HIP")
+# === Declare a HIP profiler option ===
+if("HIP" IN_LIST IPPL_PLATFORMS)
+  option(IPPL_ENABLE_HIP_PROFILER "Enable HIP Systems Profiler" OFF)
+endif()
 
-elseif("${IPPL_PLATFORMS}" STREQUAL "CUDA;OPENMP" OR "${IPPL_PLATFORMS}" STREQUAL "OPENMP;CUDA")
-    set(Kokkos_ENABLE_CUDA ON CACHE BOOL "Enable Kokkos CUDA backend" FORCE)
-    set(Kokkos_ENABLE_OPENMP ON CACHE BOOL "Enable Kokkos OpenMP backend" FORCE)
-    set(Heffte_ENABLE_CUDA ON CACHE BOOL "Enable Heffte CUDA backend" FORCE)
-    message(STATUS "🧩 Backend: CUDA + OPENMP")
+if(NOT "SERIAL" IN_LIST IPPL_PLATFORMS AND NOT "OPENMP" IN_LIST IPPL_PLATFORMS)
+  list(APPEND IPPL_PLATFORMS "SERIAL")
+  message(STATUS "Appending SERIAL to IPPL_PLATFORMS as no HOST execution space set")
+endif()
 
-elseif("${IPPL_PLATFORMS}" STREQUAL "HIP;OPENMP" OR "${IPPL_PLATFORMS}" STREQUAL "OPENMP;HIP")
-    set(Heffte_ENABLE_ROCM ON CACHE BOOL "Set Heffte ROCM Backend" FORCE)
-    set(Kokkos_ENABLE_OPENMP ON CACHE BOOL "Enable Kokkos OpenMP Backend" FORCE)
-    set(Kokkos_ENABLE_HIP ON CACHE BOOL "Enable Kokkos HIP Backend" FORCE)
-    set(KOKKOS_ENABLE_PROFILING ON CACHE BOOL "Enable Kokkos Profiling" FORCE)
-    set(Kokkos_ENABLE_LIBDL ON CACHE BOOL "Enable LIBDL" FORCE)
-    message(STATUS "🧩 Backend: HIP + OPENMP")
+# -----------------------------------------------------------------------------
+# Sanity check for known platforms
+# -----------------------------------------------------------------------------
+set(unhandled_platforms_ ${IPPL_PLATFORMS})
+foreach(platform ${IPPL_SUPPORTED_PLATFORMS})
+  if(platform IN_LIST IPPL_PLATFORMS)
+    list(REMOVE_ITEM unhandled_platforms_ ${platform})
+  endif()
+endforeach()
 
-else()
-    message(FATAL_ERROR "Unknown or unsupported IPPL_PLATFORMS: '${IPPL_PLATFORMS}'")
+if(NOT unhandled_platforms_ STREQUAL "")
+  message(FATAL_ERROR "Unknown or unsupported IPPL_PLATFORMS requested: '${unhandled_platforms_}'")
 endif()
 
-if(NOT DEFINED Heffte_ENABLE_FFTW)
-    set(Heffte_ENABLE_FFTW OFF CACHE BOOL "Enable FFTW in Heffte" FORCE)
+if("HIP" IN_LIST IPPL_PLATFORMS AND "CUDA" IN_LIST IPPL_PLATFORMS)
+  message(FATAL_ERROR "CUDA and HIP should not both be present in IPPL_PLATFORMS")
 endif()
 
-
+# -----------------------------------------------------------------------------
 # Profiler section
-option (IPPL_ENABLE_HIP_PROFILER "Enable HIP Systems Profiler" OFF)
-if (IPPL_ENABLE_HIP_PROFILER)
-    if ("${IPPL_PLATFORMS}" STREQUAL "HIP" OR "${IPPL_PLATFORMS}" STREQUAL "HIP;OPENMP" OR "${IPPL_PLATFORMS}" STREQUAL "OPENMP;HIP")
-       message (STATUS "Enabling HIP Profiler")
-       add_compile_definitions(-DIPPL_ENABLE_HIP_PROFILER)
-    else()
-        message (FATAL_ERROR "Cannot enable HIP Systems Profiler since platform is not HIP")
-    endif()
+# -----------------------------------------------------------------------------
+if(IPPL_ENABLE_HIP_PROFILER)
+  if("HIP" IN_LIST IPPL_PLATFORMS)
+    message(STATUS "🧩 Enabling HIP Profiler and KOKKOS profiliing")
+    add_compile_definitions(-DIPPL_ENABLE_HIP_PROFILER)
+  else()
+    message(FATAL_ERROR "Cannot enable HIP Systems Profiler since platform is not HIP")
+  endif()
 endif()
 
-if (IPPL_ENABLE_NSYS_PROFILER)
-    if ("${IPPL_PLATFORMS}" STREQUAL "CUDA" OR "${IPPL_PLATFORMS}" STREQUAL "CUDA;OPENMP" OR "${IPPL_PLATFORMS}" STREQUAL "OPENMP;CUDA")
-        message (STATUS "Enabling Nsys Profiler")
-        add_compile_definitions(-DIPPL_ENABLE_NSYS_PROFILER)    
-    else()
-        message (FATAL_ERROR "Cannot enable Nvidia Nsys Profiler since platform is not CUDA")
-    endif()
+if(IPPL_ENABLE_NSYS_PROFILER)
+  if("CUDA" IN_LIST IPPL_PLATFORMS)
+    message(STATUS "Enabling Nsys Profiler")
+    add_compile_definitions(-DIPPL_ENABLE_NSYS_PROFILER)
+  else()
+    message(FATAL_ERROR "Cannot enable Nvidia Nsys Profiler since platform is not CUDA")
+  endif()
 endif()
diff --git a/cmake/ProjectSetup.cmake b/cmake/ProjectSetup.cmake
index b041b466d..a9cb2a073 100644
--- a/cmake/ProjectSetup.cmake
+++ b/cmake/ProjectSetup.cmake
@@ -1,9 +1,9 @@
 # -----------------------------------------------------------------------------
 # ProjectSetup.cmake
+# cmake-format: off
 #
-# This file is responsible for foundational project settings that apply to
-# all targets and builds. It should be included near the top of the top-level
-# CMakeLists.txt.
+# This file is responsible for foundational project settings that apply to all targets 
+# and builds. It should be included near the top of the top-level CMakeLists.txt.
 #
 # Responsibilities:
 #   - Set the C++ language standard and enforcement policy
@@ -14,54 +14,66 @@
 #   - Compiler warning/sanitizer flags    → CompilerOptions.cmake
 #   - Platform/backend choices (e.g. CUDA)→ Platforms.cmake
 #   - External dependencies               → Dependencies.cmake
+#
+# cmake-format: on
+# -----------------------------------------------------------------------------
+
 # -----------------------------------------------------------------------------
+# Symbolic version string (for CLI, logs, headers, etc.)
+# -----------------------------------------------------------------------------
+set(IPPL_VERSION_NAME "IPPL v${IPPL_VERSION}")
+
+message(
+  STATUS
+    "📦 Configuring IPPL Version: ${IPPL_VERSION_MAJOR}.${IPPL_VERSION_MINOR} : \"${IPPL_VERSION_NAME}\""
+)
 
+# ------------------------------------------------------------------------------
 if(PROJECT_IS_TOP_LEVEL)
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
   if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-        "Build type (Debug, Release, RelWithDebInfo)")
+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type (Debug, Release, RelWithDebInfo)")
   endif()
 endif()
 
-# === C++ Standard ===
+# ------------------------------------------------------------------------------
+# C++ and language Standards
+# ------------------------------------------------------------------------------
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CUDA_EXTENSIONS OFF)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+# ------------------------------------------------------------------------------
+# load message macros
+# ------------------------------------------------------------------------------
+include(Messages)
 
-set(IPPL_LIB_TYPE STATIC)
+# ------------------------------------------------------------------------------
+# Static/Dynamic build : use cmake's BUILD_SHARED_LIBS but set IPPL_LIB_TYPE for log purposes
+# ------------------------------------------------------------------------------
 
-option (USE_STATIC_LIBRARIES "Link with static libraries if available" ON)
-option (Heffte_ENABLE_GPU_AWARE_MPI "Is a issue ... " OFF)
+# the user should use cmake's BUILD_SHARED_LIBS set(IPPL_LIB_TYPE STATIC)
+# mark_as_advanced(IPPL_LIB_TYPE) if(BUILD_SHARED_LIBS) set(IPPL_LIB_TYPE SHARED) endif()
+colour_message(STATUS ${Green} "🔧 IPPL will be built as a ${IPPL_LIB_TYPE} library")
 
-
-# === Default Build Type ===
+# ------------------------------------------------------------------------------
+# Default Build Type
+# ------------------------------------------------------------------------------
 set(_allowed_build_types Debug Release RelWithDebInfo MinSizeRel)
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(default_build_type "RelWithDebInfo")
-    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
-        "Choose the type of build (${_allowed_build_types})" FORCE)
-    message(STATUS "No build type specified. Defaulting to ${CMAKE_BUILD_TYPE}")
+  set(default_build_type "RelWithDebInfo")
+  set(CMAKE_BUILD_TYPE "${default_build_type}"
+      CACHE STRING "Choose the type of build (${_allowed_build_types})" FORCE)
+  colour_message(STATUS ${Red} "No build type specified. Defaulting to ${CMAKE_BUILD_TYPE}")
 else()
-    message(STATUS "Build type is: ${CMAKE_BUILD_TYPE}")
+  colour_message(STATUS ${Green} "Build type is: ${CMAKE_BUILD_TYPE}")
 endif()
 
 if(NOT CMAKE_BUILD_TYPE IN_LIST _allowed_build_types)
-    message(WARNING "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif()
-
-# === Colored Output Macros ===
-if(NOT WIN32)
-    string(ASCII 27 Esc)
-    set(ColorReset  "${Esc}[m")
-    set(ColorRed    "${Esc}[31m")
-    set(ColorGreen  "${Esc}[32m")
-    set(ColorYellow "${Esc}[1;33m")
+  colour_message(WARNING ${Red} "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 endif()
 
-message(STATUS "${ColorGreen}✅ Project setup complete${ColorReset}")
-
+# ------------------------------------------------------------------------------
+message(STATUS "✅ Project setup complete${ColorReset}")
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
deleted file mode 100644
index 092964189..000000000
--- a/cmake/Version.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# -----------------------------------------------------------------------------
-# Version.cmake
-#
-# Defines the version of the IPPL project in a centralized way.
-# 
-# Why both IPPL_VERSION and PROJECT_VERSION?
-# - PROJECT_VERSION is set by the top-level project(...) command and used by CMake.
-# - IPPL_VERSION is our internal project version we can use freely in code,
-#   messages, version headers, etc., without relying on CMake internals.
-# -----------------------------------------------------------------------------
-
-set(IPPL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(IPPL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(IPPL_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-set(IPPL_VERSION        ${PROJECT_VERSION})
-
-# Symbolic version string (for CLI, logs, headers, etc.)
-set(IPPL_VERSION_NAME   "IPPL v${IPPL_VERSION}")
-
-message(STATUS "📦 IPPL Version: ${IPPL_VERSION_NAME}")
diff --git a/cosmology/CMakeLists.txt b/cosmology/CMakeLists.txt
index 86a1a5b92..76e0ce0bd 100644
--- a/cosmology/CMakeLists.txt
+++ b/cosmology/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding index test found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding index test found in ${_relPath}")
 
 add_executable(StructureFormation StructureFormation.cpp)
 
diff --git a/doc/extras/IPPLonEULER.md b/doc/extras/IPPLonEULER.md
index 493438cde..36a243e9f 100644
--- a/doc/extras/IPPLonEULER.md
+++ b/doc/extras/IPPLonEULER.md
@@ -1,28 +1,28 @@
 # Installing IPPL on EULER {#Installation}
 
-This guide outlines the steps to install the IPPL library on the EULER cluster. Before beginning, ensure you are connected to the ETH-VPN to access the cluster. 
+This guide outlines the steps to install the IPPL library on the EULER cluster. Before beginning, ensure you are connected to the ETH-VPN to access the cluster.
 
-## Connecting to the EULER Cluster 
- 
-Use SSH to connect to EULER. Replace '\<username\>' with your actual username. 
+## Connecting to the EULER Cluster
+
+Use SSH to connect to EULER. Replace '\<username\>' with your actual username.
 
         ssh -Y <username>@euler.ethz.ch
 
-The '-Y' flag enables trusted X11 forwarding, necessary for running graphical applications remotely. 
+The '-Y' flag enables trusted X11 forwarding, necessary for running graphical applications remotely.
 
-## Preparing the Environment 
+## Preparing the Environment
 
-_Load the New Software Stack:_ Transition to the new software stack to access the latest dependencies: 
+_Load the New Software Stack:_ Transition to the new software stack to access the latest dependencies:
 
         env2lmod
 
 _Clean the Environment:_ Ensure no previous modules are loaded to avoid conflicts:
-    
+
         module purge
 
 _Load Dependencies:_ Load the required modules for IPPL:
-    
-        module load gcc/11.4.0 cmake/3.26.3 cuda/12.1.1 openmpi/4.1.4 
+
+        module load gcc/11.4.0 cmake/3.26.3 cuda/12.1.1 openmpi/4.1.4
 
 ## Cloning the IPPL Library
 
@@ -43,16 +43,16 @@ Clone the IPPL library from its repository:
 Choose from the following options based on your needs. If necessary, you can build multiple versions in separate directories.
 
 **Serial Version** (for single-node computing)
-        
+
         cmake .. -DCMAKE_CXX_STANDARD=20 -DIPPL_PLATFORMS=SERIAL -DIPPL_ENABLE_SOLVERS=ON -DIPPL_ENABLE_FFT=ON -DIPPL_ENABLE_ALPINE=ON
 
 **OpenMP Version** (for multi-threaded computing):
-        
+
         cmake .. -DCMAKE_CXX_STANDARD=20 -DIPPL_PLATFORMS=OPENMP -DIPPL_ENABLE_SOLVERS=ON -DIPPL_ENABLE_FFT=ON -DIPPL_ENABLE_ALPINE=ON
 
 **Cuda Version** (for GPU computing):
-        
-        cmake .. -DCMAKE_CXX_STANDARD=20 -DIPPL_PLATFORMS=CUDA -DIPPL_ENABLE_SOLVERS=ON -DIPPL_ENABLE_FFT=ON -DIPPL_ENABLE_ALPINE=ON -DUSE_ALTERNATIVE_VARIANT=OFF -DKokkos_ARCH_[architecture]=ON
+
+        cmake .. -DCMAKE_CXX_STANDARD=20 -DIPPL_PLATFORMS=CUDA -DIPPL_ENABLE_SOLVERS=ON -DIPPL_ENABLE_FFT=ON -DIPPL_ENABLE_ALPINE=ON -DIPPL_USE_ALTERNATIVE_VARIANT=OFF -DKokkos_ARCH_[architecture]=ON
 
 [architecture] should be the target architecture, e.g.
 
@@ -63,7 +63,7 @@ Choose from the following options based on your needs. If necessary, you can bui
 
 
 #### Compile
-        
+
         make
 
 ## Testing Your Installation
@@ -80,5 +80,5 @@ This command allocates one computing node with 32GB of RAM for 60 minutes.
 ## Links
 
 Repository for Independent Parallel Particle Layer (IPPL)
-        
+
         https://github.com/IPPL-framework/ippl
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 8aded5ba7..39ea666b8 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding index test found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding index test found in ${_relPath}")
 
 add_subdirectory(collisions)
diff --git a/examples/collisions/CMakeLists.txt b/examples/collisions/CMakeLists.txt
index ee8081941..846655f38 100644
--- a/examples/collisions/CMakeLists.txt
+++ b/examples/collisions/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding index test found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding index test found in ${_relPath}")
 
 add_executable(P3MHeating P3MHeating.cpp)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d4918eb48..1f7b216e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 # -----------------------------------------------------------------------------
 # src/CMakeLists.txt
+# cmake-format: off
 #
 # This file builds the main IPPL library target. It:
 #   - Generates IpplVersions.h from current build system info
@@ -7,6 +8,8 @@
 #   - Adds all component subdirectories (Communicate, Field, etc.)
 #   - Links to external libraries (Kokkos, Heffte)
 #   - Installs headers and the library
+#
+# cmake-format: on
 # -----------------------------------------------------------------------------
 message(STATUS "📄 Generating IpplVersions.h")
 
@@ -15,31 +18,20 @@ option(IPPL_EMBED_BUILD_METADATA "Embed user/machine/date in IpplVersions.h" OFF
 
 if(IPPL_EMBED_BUILD_METADATA)
 
-  execute_process(
-      COMMAND date
-      OUTPUT_VARIABLE IPPL_COMPILE_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  execute_process(COMMAND date OUTPUT_VARIABLE IPPL_COMPILE_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  execute_process(
-      COMMAND uname -a
-      OUTPUT_VARIABLE IPPL_COMPILE_MACHINE OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  execute_process(COMMAND uname -a OUTPUT_VARIABLE IPPL_COMPILE_MACHINE
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  execute_process(
-      COMMAND whoami
-      OUTPUT_VARIABLE IPPL_COMPILE_USER OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  execute_process(COMMAND whoami OUTPUT_VARIABLE IPPL_COMPILE_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
   set(IPPL_COMPILE_DATE "unknown")
   set(IPPL_COMPILE_MACHINE "unknown")
   set(IPPL_COMPILE_USER "unknown")
 endif()
 
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/IpplVersions.h
-    @ONLY
-)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/IpplVersions.h @ONLY)
 
 add_library(ippl)
 
@@ -47,17 +39,19 @@ add_library(ippl::ippl ALIAS ippl)
 
 target_compile_features(ippl PUBLIC cxx_std_20)
 
-target_compile_options(ippl PUBLIC
-  $<$<COMPILE_LANGUAGE:CXX>:
-    $<$<CONFIG:Debug>:-O0 -g>
-    $<$<CONFIG:RelWithDebInfo>:-O3 -g>
-    $<$<CONFIG:Release>:-O3>
-  >
-)
+target_compile_options(
+  ippl
+  PUBLIC $<$<COMPILE_LANGUAGE:CXX>:
+         $<$<CONFIG:Debug>:-O0
+         -g>
+         $<$<CONFIG:RelWithDebInfo>:-O3
+         -g>
+         $<$<CONFIG:Release>:-O3>
+         >)
 
 get_target_property(_ippl_type ippl TYPE)
 if(_ippl_type)
-  string(REPLACE "_LIBRARY" "" _ippl_type "${_ippl_type}")  # -> STATIC / SHARED / OBJECT / INTERFACE
+  string(REPLACE "_LIBRARY" "" _ippl_type "${_ippl_type}") # -> STATIC / SHARED / OBJECT / INTERFACE
 else()
   set(_ippl_type "UNKNOWN")
 endif()
@@ -70,60 +64,48 @@ endif()
 
 message(STATUS "🔧 Target 'ippl': type=${_ippl_type}, POSITION_INDEPENDENT_CODE=${_ippl_pic}")
 
-target_sources(ippl
-    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/Ippl.cpp
-)
+target_sources(ippl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Ippl.cpp)
 
-target_include_directories(ippl
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ippl>
-    PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}
-)
+target_include_directories(
+  ippl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+              $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ippl>
+  PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
-add_subdirectory (Communicate)
+add_subdirectory(Communicate)
 
-if (IPPL_ENABLE_FFT)
-    add_subdirectory (FFT)
+if(IPPL_ENABLE_FFT)
+  add_subdirectory(FFT)
 endif()
 
-add_subdirectory (Field)
-add_subdirectory (FieldLayout)
-add_subdirectory (Decomposition)
-add_subdirectory (Index)
-add_subdirectory (Interpolation)
-add_subdirectory (Manager)
-add_subdirectory (Meshes)
-add_subdirectory (Particle)
-add_subdirectory (Region)
-add_subdirectory (Utility)
-add_subdirectory (Expression)
-add_subdirectory (Types)
-add_subdirectory (Partition)
-add_subdirectory (FEM)
-add_subdirectory (Random)
-
-if (IPPL_ENABLE_SOLVERS)
-    message (STATUS "Adding Solver subdirectories")
-    add_subdirectory (PoissonSolvers)
-    add_subdirectory (MaxwellSolvers)
-    add_subdirectory (LinearSolvers)
-endif ()
+add_subdirectory(Field)
+add_subdirectory(FieldLayout)
+add_subdirectory(Decomposition)
+add_subdirectory(Index)
+add_subdirectory(Interpolation)
+add_subdirectory(Manager)
+add_subdirectory(Meshes)
+add_subdirectory(Particle)
+add_subdirectory(Region)
+add_subdirectory(Utility)
+add_subdirectory(Expression)
+add_subdirectory(Types)
+add_subdirectory(Partition)
+add_subdirectory(FEM)
+add_subdirectory(Random)
+
+if(IPPL_ENABLE_SOLVERS)
+  message(STATUS "Adding Solver subdirectories")
+  add_subdirectory(PoissonSolvers)
+  add_subdirectory(MaxwellSolvers)
+  add_subdirectory(LinearSolvers)
+endif()
 
 include(${PROJECT_SOURCE_DIR}/cmake/PlatformOptions.cmake)
 
-target_link_libraries(ippl
-    PUBLIC
-        Kokkos::kokkos
-        MPI::MPI_CXX
-)
+target_link_libraries(ippl PUBLIC Kokkos::kokkos MPI::MPI_CXX)
 
-if(IPPL_ENABLE_FFT AND TARGET Heffte::heffte)
-    target_link_libraries(ippl PUBLIC Heffte::heffte)
-else()
-    message(WARNING "⚠️ Heffte::heffte target not found — skipping link.")
+if(IPPL_ENABLE_FFT)
+  target_link_libraries(ippl PUBLIC Heffte::Heffte)
 endif()
 
-include(${PROJECT_SOURCE_DIR}/cmake/InstallIppl.cmake)
+include(InstallIppl)
diff --git a/src/Communicate/CMakeLists.txt b/src/Communicate/CMakeLists.txt
index 0fc64db00..95e7b4819 100644
--- a/src/Communicate/CMakeLists.txt
+++ b/src/Communicate/CMakeLists.txt
@@ -4,12 +4,5 @@
 # Adds all Communicate-related sources and headers to the IPPL library.
 # -----------------------------------------------------------------------------
 
-target_sources(ippl
-    PRIVATE
-        Communicator.cpp
-        CommunicatorLogging.cpp
-        Environment.cpp
-        Buffers.cpp
-        Request.cpp
-        LogEntry.cpp
-)
+target_sources(ippl PRIVATE Communicator.cpp CommunicatorLogging.cpp Environment.cpp Buffers.cpp
+                            Request.cpp LogEntry.cpp)
diff --git a/src/Decomposition/CMakeLists.txt b/src/Decomposition/CMakeLists.txt
index b83972338..df84414be 100644
--- a/src/Decomposition/CMakeLists.txt
+++ b/src/Decomposition/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds headers for domain decomposition strategies to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Expression/CMakeLists.txt b/src/Expression/CMakeLists.txt
index 6fcca3f13..e35ca031e 100644
--- a/src/Expression/CMakeLists.txt
+++ b/src/Expression/CMakeLists.txt
@@ -4,7 +4,5 @@
 # Adds expression-related headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
-
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/FEM/CMakeLists.txt b/src/FEM/CMakeLists.txt
index bdefc9cab..84b812c04 100644
--- a/src/FEM/CMakeLists.txt
+++ b/src/FEM/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds core Field data structure headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/FFT/CMakeLists.txt b/src/FFT/CMakeLists.txt
index 011df6d62..49e970b76 100644
--- a/src/FFT/CMakeLists.txt
+++ b/src/FFT/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds FFT interface headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Field/CMakeLists.txt b/src/Field/CMakeLists.txt
index bdefc9cab..84b812c04 100644
--- a/src/Field/CMakeLists.txt
+++ b/src/Field/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds core Field data structure headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/FieldLayout/CMakeLists.txt b/src/FieldLayout/CMakeLists.txt
index 1123c1bc1..93f346f14 100644
--- a/src/FieldLayout/CMakeLists.txt
+++ b/src/FieldLayout/CMakeLists.txt
@@ -5,8 +5,4 @@
 # -----------------------------------------------------------------------------
 
 # Register FieldLayout source
-target_sources(ippl
-    PRIVATE
-        FieldLayout.cpp
-)
-
+target_sources(ippl PRIVATE FieldLayout.cpp)
diff --git a/src/Index/CMakeLists.txt b/src/Index/CMakeLists.txt
index 5b7908c8f..b15f11775 100644
--- a/src/Index/CMakeLists.txt
+++ b/src/Index/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds multi-dimensional index headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Interaction/CMakeLists.txt b/src/Interaction/CMakeLists.txt
index 2b5c77d69..d460e0ac2 100644
--- a/src/Interaction/CMakeLists.txt
+++ b/src/Interaction/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds ParticleParticle Interactions to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Interpolation/CMakeLists.txt b/src/Interpolation/CMakeLists.txt
index 299c2c1a2..bbfc80e56 100644
--- a/src/Interpolation/CMakeLists.txt
+++ b/src/Interpolation/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds particle-to-grid interpolation headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/LinearSolvers/CMakeLists.txt b/src/LinearSolvers/CMakeLists.txt
index 9787e8e9e..9ad3e7bb0 100644
--- a/src/LinearSolvers/CMakeLists.txt
+++ b/src/LinearSolvers/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds linear solver interface headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Manager/CMakeLists.txt b/src/Manager/CMakeLists.txt
index aee1c0247..fe5a61bf9 100644
--- a/src/Manager/CMakeLists.txt
+++ b/src/Manager/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds simulation manager interfaces to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/MaxwellSolvers/CMakeLists.txt b/src/MaxwellSolvers/CMakeLists.txt
index 733c4245d..287771d8f 100644
--- a/src/MaxwellSolvers/CMakeLists.txt
+++ b/src/MaxwellSolvers/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds Maxwell solver header to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Meshes/CMakeLists.txt b/src/Meshes/CMakeLists.txt
index f85ee22e0..fe725b30e 100644
--- a/src/Meshes/CMakeLists.txt
+++ b/src/Meshes/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds structured grid mesh headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Particle/CMakeLists.txt b/src/Particle/CMakeLists.txt
index aeafd97b2..293fb4f73 100644
--- a/src/Particle/CMakeLists.txt
+++ b/src/Particle/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds particle container and layout headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Partition/CMakeLists.txt b/src/Partition/CMakeLists.txt
index e6c4c342c..c8cce0e25 100644
--- a/src/Partition/CMakeLists.txt
+++ b/src/Partition/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds domain partitioning headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/PoissonSolvers/CMakeLists.txt b/src/PoissonSolvers/CMakeLists.txt
index eff6a09b4..067a892a0 100644
--- a/src/PoissonSolvers/CMakeLists.txt
+++ b/src/PoissonSolvers/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds Poisson solver headers to the IPPL target, optionally with FFT backends.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Random/CMakeLists.txt b/src/Random/CMakeLists.txt
index d4820a2b6..35a44793c 100644
--- a/src/Random/CMakeLists.txt
+++ b/src/Random/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds random sampling and distribution headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Region/CMakeLists.txt b/src/Region/CMakeLists.txt
index 9d0d7e286..a80078812 100644
--- a/src/Region/CMakeLists.txt
+++ b/src/Region/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds region and region layout headers to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Types/CMakeLists.txt b/src/Types/CMakeLists.txt
index 47a4bec4f..addd8006c 100644
--- a/src/Types/CMakeLists.txt
+++ b/src/Types/CMakeLists.txt
@@ -4,6 +4,5 @@
 # Adds core type definitions and traits to the IPPL target.
 # -----------------------------------------------------------------------------
 
-# Nothing to do: public headers in this folder are visible via
-# target_include_directories(ippl ... $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-# and are installed centrally by InstallIppl.cmake.
+# Nothing to do: public headers in this folder are visible via target_include_directories(ippl ...
+# $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>) and are installed centrally by InstallIppl.cmake.
diff --git a/src/Types/Variant.h b/src/Types/Variant.h
index 196029878..6332574c0 100644
--- a/src/Types/Variant.h
+++ b/src/Types/Variant.h
@@ -1,4 +1,4 @@
-#ifdef USE_ALTERNATIVE_VARIANT
+#ifdef IPPL_USE_ALTERNATIVE_VARIANT
 // <variant> -*- C++ -*-
 
 // Copyright (C) 2016-2023 Free Software Foundation, Inc.
diff --git a/src/Utility/CMakeLists.txt b/src/Utility/CMakeLists.txt
index 7108f92e4..609d2baea 100644
--- a/src/Utility/CMakeLists.txt
+++ b/src/Utility/CMakeLists.txt
@@ -5,12 +5,4 @@
 # -----------------------------------------------------------------------------
 
 # Add Utility source files to the ippl library
-target_sources(ippl
-    PRIVATE
-        Inform.cpp
-        IpplInfo.cpp
-        IpplTimings.cpp
-        PAssert.cpp
-        Timer.cpp
-)
-
+target_sources(ippl PRIVATE Inform.cpp IpplInfo.cpp IpplTimings.cpp PAssert.cpp Timer.cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e3e8f92ef..0381aadb8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,9 @@
 # -----------------------------------------------------------------------------
 # test/CMakeLists.txt
 #
-# These are NOT unit tests. These are full simulation examples or integration
-# tests that check combined module functionality. They build standalone
-# executables and are run using `ctest` to check successful execution.
+# These are NOT unit tests. These are full simulation examples or integration tests that check
+# combined module functionality. They build standalone executables and are run using `ctest` to
+# check successful execution.
 # -----------------------------------------------------------------------------
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/test/cmake")
@@ -13,14 +13,14 @@ add_subdirectory(kokkos)
 add_subdirectory(types)
 add_subdirectory(field)
 
-if (IPPL_ENABLE_FFT)
-    add_subdirectory(FFT)
+if(IPPL_ENABLE_FFT)
+  add_subdirectory(FFT)
 endif()
 
-if (IPPL_ENABLE_SOLVERS)
-    add_subdirectory(solver)
-    add_subdirectory(solver/fem)
-    add_subdirectory(maxwell)
+if(IPPL_ENABLE_SOLVERS)
+  add_subdirectory(solver)
+  add_subdirectory(solver/fem)
+  add_subdirectory(maxwell)
 endif()
 
 add_subdirectory(particle)
@@ -28,4 +28,3 @@ add_subdirectory(region)
 add_subdirectory(random)
 add_subdirectory(serialization)
 add_subdirectory(FEM)
-
diff --git a/test/FEM/CMakeLists.txt b/test/FEM/CMakeLists.txt
index 8b02d0b74..0d25cb435 100644
--- a/test/FEM/CMakeLists.txt
+++ b/test/FEM/CMakeLists.txt
@@ -1,12 +1,12 @@
 # -----------------------------------------------------------------------------
 # test/FEM/CMakeLists.txt
 #
-# Integration tests for FEM functionality. These build example executables
-# that run and validate FEM behavior across supported configurations.
+# Integration tests for FEM functionality. These build example executables that run and validate FEM
+# behavior across supported configurations.
 # -----------------------------------------------------------------------------
 
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding index test found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding index test found in ${_relPath}")
 
 add_ippl_integration_test(TestLagrangeSpace1D LABELS integration fem)
 add_ippl_integration_test(TestLagrangeSpace2D LABELS integration fem)
diff --git a/test/FFT/CMakeLists.txt b/test/FFT/CMakeLists.txt
index 83a9a99f1..0fb673915 100644
--- a/test/FFT/CMakeLists.txt
+++ b/test/FFT/CMakeLists.txt
@@ -1,8 +1,8 @@
 # -----------------------------------------------------------------------------
 # test/FFT/CMakeLists.txt
 #
-# Integration tests for FFT functionality. These build example executables
-# that run and validate FFT behavior across supported configurations.
+# Integration tests for FFT functionality. These build example executables that run and validate FFT
+# behavior across supported configurations.
 # -----------------------------------------------------------------------------
 
 file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -10,7 +10,6 @@ message(STATUS "🔧 Adding FFT integration tests from: ${_relPath}")
 
 add_ippl_integration_test(TestFFTCC LABELS integration fft)
 add_ippl_integration_test(TestFFTRC LABELS integration fft)
-add_ippl_integration_test(TestSine  LABELS integration fft)
-add_ippl_integration_test(TestCos   LABELS integration fft)
-add_ippl_integration_test(TestCos1  LABELS integration fft)
-
+add_ippl_integration_test(TestSine LABELS integration fft)
+add_ippl_integration_test(TestCos LABELS integration fft)
+add_ippl_integration_test(TestCos1 LABELS integration fft)
diff --git a/test/cmake/AddIpplIntegrationTest.cmake b/test/cmake/AddIpplIntegrationTest.cmake
index 7a03c5359..de08fef63 100644
--- a/test/cmake/AddIpplIntegrationTest.cmake
+++ b/test/cmake/AddIpplIntegrationTest.cmake
@@ -1,12 +1,13 @@
 # -----------------------------------------------------------------------------
 # AddIpplIntegrationTest.cmake
 #
-# Defines a helper function `add_ippl_integration_test()` to add integration tests.
-# It builds an executable, links it with IPPL and MPI, includes headers from IPPL,
-# and registers the test with CTest. Labels are optional and default to "integration".
+# Defines a helper function `add_ippl_integration_test()` to add integration tests. It builds an
+# executable, links it with IPPL and MPI, includes headers from IPPL, and registers the test with
+# CTest. Labels are optional and default to "integration".
 # -----------------------------------------------------------------------------
 
 # -----------------------------------------------------------------------------
+# ~~~
 # add_ippl_integration_test(<name>
 #   [SOURCES <src1> <src2> ...]        # default: <name>.cpp
 #   [ARGS <arg1> <arg2> ...]           # args passed to the test binary
@@ -22,6 +23,7 @@
 #   [INCLUDE_DIRS <dir1> <dir2> ...]   # extra include dirs for this target
 #   [PROPERTIES <ctest-prop> <val> ...]# extra set_tests_properties
 # )
+# ~~~
 # -----------------------------------------------------------------------------
 
 set(IPPL_DEFAULT_TEST_PROCS "2" CACHE STRING "Default MPI ranks per unit/integration test")
@@ -29,9 +31,22 @@ set(IPPL_DEFAULT_TEST_PROCS "2" CACHE STRING "Default MPI ranks per unit/integra
 function(add_ippl_integration_test TEST_NAME)
   set(options NO_MPI REQUIRE_MPI)
   set(oneValueArgs NUM_PROCS TIMEOUT WORKING_DIRECTORY)
-  set(multiValueArgs LABELS ARGS MPI_ARGS SOURCES LAUNCH LINK_LIBS INCLUDE_DIRS PROPERTIES)
+  set(multiValueArgs
+      LABELS
+      ARGS
+      MPI_ARGS
+      SOURCES
+      LAUNCH
+      LINK_LIBS
+      INCLUDE_DIRS
+      PROPERTIES)
   cmake_parse_arguments(TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
+  if("${TEST_NAME}" IN_LIST IPPL_DISABLED_TEST_LIST)
+    message(STATUS "Skipping disabled test: ${TEST_NAME}")
+    return()
+  endif()
+
   if(TEST_SOURCES)
     set(_sources ${TEST_SOURCES})
   else()
@@ -78,23 +93,20 @@ function(add_ippl_integration_test TEST_NAME)
     set(_launched_cmd ${_cmd})
   endif()
 
-  
   # MPI handling
   if(TEST_NO_MPI)
     set(_final_cmd ${_launched_cmd})
   else()
     if(DEFINED MPIEXEC_EXECUTABLE)
-      set(_final_cmd
-        ${MPIEXEC_EXECUTABLE}
-        ${MPIEXEC_NUMPROC_FLAG} ${_procs}
-        ${TEST_MPI_ARGS}
-        ${_launched_cmd})
+      set(_final_cmd ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_procs} ${MPIEXEC_PREFLAGS}
+                     ${TEST_MPI_ARGS} ${_launched_cmd})
     elseif(TEST_REQUIRE_MPI)
       # Create a disabled test with a clear reason
       set(_final_cmd ${_launched_cmd})
       set(_will_disable TRUE)
     else()
-      message(STATUS "add_ippl_integration_test(${TEST_NAME}): MPI not found; running without mpiexec")
+      message(
+        STATUS "add_ippl_integration_test(${TEST_NAME}): MPI not found; running without mpiexec")
       set(_final_cmd ${_launched_cmd})
     endif()
   endif()
@@ -120,23 +132,28 @@ function(add_ippl_integration_test TEST_NAME)
     add_test(NAME ${_ctest_name} COMMAND ${_final_cmd})
 
     # Core properties
-    set_tests_properties(${_ctest_name} PROPERTIES
-      TIMEOUT ${_timeout}
-      LABELS "${_labels}"
-      PROCESSORS ${_processors}
-      WORKING_DIRECTORY "${_workdir}"
-      ENVIRONMENT
+    set_tests_properties(
+      ${_ctest_name}
+      PROPERTIES
+        TIMEOUT
+        ${_timeout}
+        LABELS
+        "${_labels}"
+        PROCESSORS
+        ${_processors}
+        WORKING_DIRECTORY
+        "${_workdir}"
+        ENVIRONMENT
         "OMP_NUM_THREADS=${_threads};
          KOKKOS_NUM_THREADS=${_threads};
          MKL_NUM_THREADS=1;
          OPENBLAS_NUM_THREADS=1;
-         FFTW_THREADS=1"
-    )
+         FFTW_THREADS=1")
 
     # Disable if MPI was required but missing
     if(_will_disable)
-      set_tests_properties(${_ctest_name} PROPERTIES DISABLED TRUE
-        SKIP_REGULAR_EXPRESSION "MPI required but not found")
+      set_tests_properties(${_ctest_name} PROPERTIES DISABLED TRUE SKIP_REGULAR_EXPRESSION
+                                                     "MPI required but not found")
     endif()
 
     # Extra CTest properties from caller
@@ -145,4 +162,3 @@ function(add_ippl_integration_test TEST_NAME)
     endif()
   endif()
 endfunction()
-
diff --git a/test/field/CMakeLists.txt b/test/field/CMakeLists.txt
index c3887516d..bad272bc5 100644
--- a/test/field/CMakeLists.txt
+++ b/test/field/CMakeLists.txt
@@ -1,25 +1,42 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding index test found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding index test found in ${_relPath}")
 
-add_ippl_integration_test(TestLaplace 
-  LABELS integration field
-  ARGS 10 10 --info 10
-)
+add_ippl_integration_test(
+  TestLaplace
+  LABELS
+  integration
+  field
+  ARGS
+  10
+  10
+  --info
+  10)
 
 add_ippl_integration_test(TestFieldBC LABELS integration field)
 
 add_ippl_integration_test(TestHalo LABELS integration field)
 
-add_ippl_integration_test(TestCurl
-    LABELS integration field
-    ARGS 10 0 --info 10
-)
-
-add_ippl_integration_test(TestHessian 
-    LABELS integration field
-    ARGS 10 0 --info 10
-)
+add_ippl_integration_test(
+  TestCurl
+  LABELS
+  integration
+  field
+  ARGS
+  10
+  0
+  --info
+  10)
 
+add_ippl_integration_test(
+  TestHessian
+  LABELS
+  integration
+  field
+  ARGS
+  10
+  0
+  --info
+  10)
 
 if("${Kokkos_DEVICES}" MATCHES "CUDA" AND "${Kokkos_DEVICES}" MATCHES "OPENMP")
   add_ippl_integration_test(TestMixedExec LABELS integration field)
diff --git a/test/kokkos/CMakeLists.txt b/test/kokkos/CMakeLists.txt
index 7071c7e0b..226cf7bcb 100644
--- a/test/kokkos/CMakeLists.txt
+++ b/test/kokkos/CMakeLists.txt
@@ -10,4 +10,3 @@ add_ippl_integration_test(TestVectorField LABELS integration kokkos)
 add_ippl_integration_test(TestVectorField2 LABELS integration kokkos)
 add_ippl_integration_test(TestVectorField3 LABELS integration kokkos)
 add_ippl_integration_test(TestVectorField4 LABELS integration kokkos)
-
diff --git a/test/maxwell/CMakeLists.txt b/test/maxwell/CMakeLists.txt
index 71df8c777..60da8c0d8 100644
--- a/test/maxwell/CMakeLists.txt
+++ b/test/maxwell/CMakeLists.txt
@@ -11,28 +11,24 @@ message(STATUS "🔧 Adding maxwell integration tests from: ${_relPath}")
 option(IPPL_FETCH_TEST_ASSETS "Download test-only assets (e.g. stb headers)" ON)
 set(IPPL_STB_DIR "" CACHE PATH "Provide a directory containing stb_image_write.h to avoid network")
 
-
 if(IPPL_STB_DIR)
-    set(_stb_inc_dir "${IPPL_STB_DIR}")
+  set(_stb_inc_dir "${IPPL_STB_DIR}")
 elseif(IPPL_FETCH_TEST_ASSETS)
   set(_stb_inc_dir "${CMAKE_BINARY_DIR}/_third_party/stb")
-  set(_stb_hdr     "${_stb_inc_dir}/stb_image_write.h")
+  set(_stb_hdr "${_stb_inc_dir}/stb_image_write.h")
   file(MAKE_DIRECTORY "${_stb_inc_dir}")
   if(NOT EXISTS "${_stb_hdr}")
     message(STATUS "⬇️  Fetching stb_image_write.h for integration tests …")
-    file(DOWNLOAD
-      "https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h"
-      "${_stb_hdr}"
-      STATUS _dl_status
-      TLS_VERIFY ON
-    )
+    file(DOWNLOAD "https://raw.githubusercontent.com/nothings/stb/master/stb_image_write.h"
+         "${_stb_hdr}" STATUS _dl_status TLS_VERIFY ON)
     list(GET _dl_status 0 _code)
     if(NOT _code EQUAL 0)
       message(FATAL_ERROR "Failed to download stb_image_write.h: ${_dl_status}")
     endif()
   endif()
 else()
-  message(FATAL_ERROR "stb_image_write.h unavailable. Set IPPL_STB_DIR or enable IPPL_FETCH_TEST_ASSETS.")
+  message(
+    FATAL_ERROR "stb_image_write.h unavailable. Set IPPL_STB_DIR or enable IPPL_FETCH_TEST_ASSETS.")
 endif()
 
 if(NOT TARGET stb_image_write::header)
@@ -44,7 +40,8 @@ endif()
 if(NOT TARGET stb_image_write::impl)
   # Generate a tiny wrapper source alongside the header
   set(_stb_wrap "${_stb_inc_dir}/stb_image_write_impl.cpp")
-  file(WRITE "${_stb_wrap}" "#define STB_IMAGE_WRITE_IMPLEMENTATION\n#include \"stb_image_write.h\"\n")
+  file(WRITE "${_stb_wrap}"
+       "#define STB_IMAGE_WRITE_IMPLEMENTATION\n#include \"stb_image_write.h\"\n")
 
   add_library(stb_image_write_impl STATIC "${_stb_wrap}")
   add_library(stb_image_write::impl ALIAS stb_image_write_impl)
@@ -54,30 +51,24 @@ if(NOT TARGET stb_image_write::impl)
   target_include_directories(stb_image_write_impl SYSTEM PRIVATE "${_stb_inc_dir}")
 
   # Silence the specific warning in this one TU (optional)
-  target_compile_options(stb_image_write_impl PRIVATE
-    $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-Wno-missing-field-initializers>
-    $<$<CXX_COMPILER_ID:MSVC>:/wd4351>
-  )
+  target_compile_options(
+    stb_image_write_impl
+    PRIVATE $<$<COMPILE_LANG_AND_ID:CXX,GNU,Clang>:-Wno-missing-field-initializers>
+            $<$<CXX_COMPILER_ID:MSVC>:/wd4351>)
 endif()
 
-
-
 if(IPPL_ENABLE_FFT)
-  add_ippl_integration_test(TestStandardFDTDSolver
-    LINK_LIBS stb_image_write::impl
-    LABELS solver integration)
+  add_ippl_integration_test(TestStandardFDTDSolver LINK_LIBS stb_image_write::impl LABELS solver
+                            integration)
 
-  add_ippl_integration_test(TestNonStandardFDTDSolver
-    LINK_LIBS stb_image_write::impl
-    LABELS solver integration)
+  add_ippl_integration_test(TestNonStandardFDTDSolver LINK_LIBS stb_image_write::impl LABELS solver
+                            integration)
 
-  add_ippl_integration_test(TestStandardFDTDSolver_convergence
-    LINK_LIBS stb_image_write::impl
-    LABELS solver integration)
+  add_ippl_integration_test(TestStandardFDTDSolver_convergence LINK_LIBS stb_image_write::impl
+                            LABELS solver integration)
 
-  add_ippl_integration_test(TestNonStandardFDTDSolver_convergence
-    LINK_LIBS stb_image_write::header
-    LABELS solver integration)
+  add_ippl_integration_test(TestNonStandardFDTDSolver_convergence LINK_LIBS stb_image_write::header
+                            LABELS solver integration)
 
 else()
   message(STATUS "⚠️ FFT disabled; skipping Maxwell FDTD integration tests.")
diff --git a/test/particle/CMakeLists.txt b/test/particle/CMakeLists.txt
index 4efac51f5..a5ad67fde 100644
--- a/test/particle/CMakeLists.txt
+++ b/test/particle/CMakeLists.txt
@@ -7,15 +7,33 @@
 file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "🔧 Adding Particle integration tests from: ${_relPath}")
 
-add_ippl_integration_test(TestScatter             LABELS integration particle)
-add_ippl_integration_test(TestGather              LABELS integration particle)
+add_ippl_integration_test(TestScatter LABELS integration particle)
+add_ippl_integration_test(TestGather LABELS integration particle)
 
-add_ippl_integration_test(PICnd                   
-    LABELS integration particle
-    ARGS 128 128 128 10000 10 --info 10
-)
+add_ippl_integration_test(
+  PICnd
+  LABELS
+  integration
+  particle
+  ARGS
+  128
+  128
+  128
+  10000
+  10
+  --info
+  10)
 
-add_ippl_integration_test(benchmarkParticleUpdate 
-  LABELS integration particle
-  ARGS 128 128 128 10000 10 --info 10
-)
+add_ippl_integration_test(
+  benchmarkParticleUpdate
+  LABELS
+  integration
+  particle
+  ARGS
+  128
+  128
+  128
+  10000
+  10
+  --info
+  10)
diff --git a/test/random/CMakeLists.txt b/test/random/CMakeLists.txt
index 8a0724a13..41096d17f 100644
--- a/test/random/CMakeLists.txt
+++ b/test/random/CMakeLists.txt
@@ -7,23 +7,12 @@
 file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "🔧 Adding random integration tests from: ${_relPath}")
 
-add_ippl_integration_test(TestInverseTransformSamplingNormal
-    LABELS random integration
-)
+add_ippl_integration_test(TestInverseTransformSamplingNormal LABELS random integration)
 
-add_ippl_integration_test(TestInverseTransformSamplingUpdateBounds
-    LABELS random integration
-)
+add_ippl_integration_test(TestInverseTransformSamplingUpdateBounds LABELS random integration)
 
-add_ippl_integration_test(TestInverseTransformSamplingSpecificRange
-    LABELS random integration
-)
+add_ippl_integration_test(TestInverseTransformSamplingSpecificRange LABELS random integration)
 
-add_ippl_integration_test(TestInverseTransformSamplingCustom
-    LABELS random integration
-)
-
-add_ippl_integration_test(TestUnboundedNormal
-    LABELS random integration
-)
+add_ippl_integration_test(TestInverseTransformSamplingCustom LABELS random integration)
 
+add_ippl_integration_test(TestUnboundedNormal LABELS random integration)
diff --git a/test/region/CMakeLists.txt b/test/region/CMakeLists.txt
index 6387944aa..ad18feccb 100644
--- a/test/region/CMakeLists.txt
+++ b/test/region/CMakeLists.txt
@@ -7,10 +7,6 @@
 file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "🔧 Adding region integration tests from: ${_relPath}")
 
-add_ippl_integration_test(TestPRegion
-    LABELS region integration
-)
+add_ippl_integration_test(TestPRegion LABELS region integration)
 
-add_ippl_integration_test(TestNDRegion
-    LABELS region integration
-)
+add_ippl_integration_test(TestNDRegion LABELS region integration)
diff --git a/test/serialization/CMakeLists.txt b/test/serialization/CMakeLists.txt
index 87d205a7d..ba8e574a1 100644
--- a/test/serialization/CMakeLists.txt
+++ b/test/serialization/CMakeLists.txt
@@ -8,7 +8,4 @@ file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}
 message(STATUS "🔧 Adding serialization integration tests from: ${_relPath}")
 
 # === Individual tests ===
-add_ippl_integration_test(serialize01
-    LABELS serialization integration
-)
-
+add_ippl_integration_test(serialize01 LABELS serialization integration)
diff --git a/test/solver/CMakeLists.txt b/test/solver/CMakeLists.txt
index a04c30b70..b7bbce0d9 100644
--- a/test/solver/CMakeLists.txt
+++ b/test/solver/CMakeLists.txt
@@ -11,12 +11,12 @@ add_ippl_integration_test(TestSolverDesign LABELS solver integration)
 add_ippl_integration_test(TestCGSolver LABELS solver integration)
 
 if(IPPL_ENABLE_FFT)
-    add_ippl_integration_test(TestGaussian_convergence LABELS solver integration)
-    add_ippl_integration_test(TestSphere LABELS solver integration)
-    add_ippl_integration_test(Budiardja_plot LABELS solver integration)
-    add_ippl_integration_test(TestGaussian LABELS solver integration)
-    add_ippl_integration_test(TestFFTPeriodicPoissonSolver LABELS solver integration)
-    add_ippl_integration_test(TestGaussian_biharmonic LABELS solver integration)
-    add_ippl_integration_test(TestGaussian_hessian LABELS solver integration)
-    add_ippl_integration_test(TestFFTTruncatedGreenPeriodicPoissonSolver LABELS solver integration)
+  add_ippl_integration_test(TestGaussian_convergence LABELS solver integration)
+  add_ippl_integration_test(TestSphere LABELS solver integration)
+  add_ippl_integration_test(Budiardja_plot LABELS solver integration)
+  add_ippl_integration_test(TestGaussian LABELS solver integration)
+  add_ippl_integration_test(TestFFTPeriodicPoissonSolver LABELS solver integration)
+  add_ippl_integration_test(TestGaussian_biharmonic LABELS solver integration)
+  add_ippl_integration_test(TestGaussian_hessian LABELS solver integration)
+  add_ippl_integration_test(TestFFTTruncatedGreenPeriodicPoissonSolver LABELS solver integration)
 endif()
diff --git a/test/solver/fem/CMakeLists.txt b/test/solver/fem/CMakeLists.txt
index c44271983..97ef9f537 100644
--- a/test/solver/fem/CMakeLists.txt
+++ b/test/solver/fem/CMakeLists.txt
@@ -33,9 +33,5 @@ add_ippl_integration_test(TestScaling_PeriodicBC_sinsin_precon LABELS solver fem
 
 # vi: set et ts=4 sw=4 sts=4:
 
-# Local Variables:
-# mode: cmake
-# cmake-tab-width: 4
-# indent-tabs-mode: nil
-# require-final-newline: nil
+# Local Variables: mode: cmake cmake-tab-width: 4 indent-tabs-mode: nil require-final-newline: nil
 # End:
diff --git a/test/types/CMakeLists.txt b/test/types/CMakeLists.txt
index ced9cdf1d..aaf3e6d4f 100644
--- a/test/types/CMakeLists.txt
+++ b/test/types/CMakeLists.txt
@@ -8,7 +8,6 @@ file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}
 message(STATUS "🔧 Adding type-related integration tests from: ${_relPath}")
 
 add_ippl_integration_test(TestVector LABELS integration types)
-#add_ippl_integration_test(TestTuple LABELS integration types)
+# add_ippl_integration_test(TestTuple LABELS integration types)
 add_ippl_integration_test(TestVector2 LABELS integration types)
 add_ippl_integration_test(TestVector3 LABELS integration types)
-
diff --git a/unit_tests/BareField/CMakeLists.txt b/unit_tests/BareField/CMakeLists.txt
index 80fb1f674..7461e608f 100644
--- a/unit_tests/BareField/CMakeLists.txt
+++ b/unit_tests/BareField/CMakeLists.txt
@@ -1,4 +1,4 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(BareField)
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 87f5c35db..90a2f0f25 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -5,7 +5,9 @@
 # -----------------------------------------------------------------------------
 
 if(NOT IPPL_ENABLE_FFT)
-  message(FATAL_ERROR "Unit tests require IPPL_ENABLE_FFT to be ON. Please configure with -DIPPL_ENABLE_FFT=ON.")
+  message(
+    FATAL_ERROR
+      "Unit tests require IPPL_ENABLE_FFT to be ON. Please configure with -DIPPL_ENABLE_FFT=ON.")
 endif()
 
 if(NOT TARGET GTest::gtest)
@@ -16,9 +18,8 @@ include(GoogleTest)
 
 if(NOT TARGET ippl_test_support)
   add_library(ippl_test_support INTERFACE)
-  target_include_directories(ippl_test_support INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  )
+  target_include_directories(ippl_test_support
+                             INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
   add_library(ippl::test_support ALIAS ippl_test_support)
 endif()
 
diff --git a/unit_tests/Communicate/CMakeLists.txt b/unit_tests/Communicate/CMakeLists.txt
index 777207998..7f1ff26cf 100644
--- a/unit_tests/Communicate/CMakeLists.txt
+++ b/unit_tests/Communicate/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(BufferHandler)
 add_ippl_test(LoggingBufferHandler)
diff --git a/unit_tests/FEM/CMakeLists.txt b/unit_tests/FEM/CMakeLists.txt
index e097b5ce9..61f614e9b 100644
--- a/unit_tests/FEM/CMakeLists.txt
+++ b/unit_tests/FEM/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(EdgeElement)
 add_ippl_test(QuadrilateralElement)
diff --git a/unit_tests/FFT/CMakeLists.txt b/unit_tests/FFT/CMakeLists.txt
index bcee65efb..54e33fb1e 100644
--- a/unit_tests/FFT/CMakeLists.txt
+++ b/unit_tests/FFT/CMakeLists.txt
@@ -1,4 +1,4 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(FFT)
diff --git a/unit_tests/Field/CMakeLists.txt b/unit_tests/Field/CMakeLists.txt
index b4c1da01f..1ebc67277 100644
--- a/unit_tests/Field/CMakeLists.txt
+++ b/unit_tests/Field/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(Field)
 add_ippl_test(FieldBC)
diff --git a/unit_tests/Meshes/CMakeLists.txt b/unit_tests/Meshes/CMakeLists.txt
index e004d255c..6983f550c 100644
--- a/unit_tests/Meshes/CMakeLists.txt
+++ b/unit_tests/Meshes/CMakeLists.txt
@@ -1,4 +1,4 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(UniformCartesian)
diff --git a/unit_tests/PIC/CMakeLists.txt b/unit_tests/PIC/CMakeLists.txt
index 4301ac451..c7cd46f45 100644
--- a/unit_tests/PIC/CMakeLists.txt
+++ b/unit_tests/PIC/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(ORB)
 add_ippl_test(PIC)
diff --git a/unit_tests/Particle/CMakeLists.txt b/unit_tests/Particle/CMakeLists.txt
index 6d0d7ac70..0e16def5d 100644
--- a/unit_tests/Particle/CMakeLists.txt
+++ b/unit_tests/Particle/CMakeLists.txt
@@ -1,5 +1,5 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(ParticleBase)
 add_ippl_test(ParticleBC)
diff --git a/unit_tests/Utility/CMakeLists.txt b/unit_tests/Utility/CMakeLists.txt
index e431b076d..687806dd2 100644
--- a/unit_tests/Utility/CMakeLists.txt
+++ b/unit_tests/Utility/CMakeLists.txt
@@ -1,4 +1,4 @@
-file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-message (STATUS "Adding unit tests found in ${_relPath}")
+file(RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "Adding unit tests found in ${_relPath}")
 
 add_ippl_test(ParameterList)
diff --git a/unit_tests/cmake/AddIpplTest.cmake b/unit_tests/cmake/AddIpplTest.cmake
index 81565d1e1..89d9f6fa1 100644
--- a/unit_tests/cmake/AddIpplTest.cmake
+++ b/unit_tests/cmake/AddIpplTest.cmake
@@ -1,12 +1,12 @@
 # -----------------------------------------------------------------------------
 # AddIpplTest.cmake
 #
-# Defines a helper macro `add_ippl_test()` to create a unit test executable.
-# It links to IPPL and GoogleTest, and sets include directories and labels.
+# Defines a helper macro `add_ippl_test()` to create a unit test executable. It links to IPPL and
+# GoogleTest, and sets include directories and labels.
 # -----------------------------------------------------------------------------
 
-
 # -----------------------------------------------------------------------------
+# ~~~
 # add_ippl_test(<name>
 #   [SOURCES <src1> <src2> ...]        # default: <name>.cpp
 #   [ARGS <arg1> <arg2> ...]           # args passed to the test binary
@@ -22,6 +22,7 @@
 #   [USE_GTEST_MAIN]                   # link GTest::gtest_main instead of gtest
 #   [PROPERTIES <ctest-prop> <val> ...]# extra set_tests_properties
 # )
+# ~~~
 # -----------------------------------------------------------------------------
 
 set(IPPL_DEFAULT_TEST_PROCS "2" CACHE STRING "Default MPI ranks per unit test")
@@ -32,6 +33,11 @@ function(add_ippl_test TEST_NAME)
   set(multiValueArgs LABELS ARGS MPI_ARGS SOURCES LAUNCH PROPERTIES)
   cmake_parse_arguments(TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
+  if("${TEST_NAME}" IN_LIST IPPL_DISABLED_TEST_LIST)
+    message(STATUS "Skipping disabled test: ${TEST_NAME}")
+    return()
+  endif()
+
   if(TEST_SOURCES)
     set(_sources ${TEST_SOURCES})
   else()
@@ -89,16 +95,13 @@ function(add_ippl_test TEST_NAME)
     set(_final_cmd ${_launched_cmd})
   else()
     if(DEFINED MPIEXEC_EXECUTABLE)
-      set(_final_cmd
-        ${MPIEXEC_EXECUTABLE}
-        ${MPIEXEC_NUMPROC_FLAG} ${_procs}
-        ${TEST_MPI_ARGS}
-        ${_launched_cmd})
+      set(_final_cmd ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_procs} ${MPIEXEC_PREFLAGS}
+                     ${TEST_MPI_ARGS} ${_launched_cmd})
     elseif(TEST_REQUIRE_MPI)
       # Add a disabled test with a clear message
       add_test(NAME ${TEST_NAME} COMMAND ${_launched_cmd})
-      set_tests_properties(${TEST_NAME} PROPERTIES DISABLED TRUE
-        SKIP_REGULAR_EXPRESSION "MPI required but not found")
+      set_tests_properties(${TEST_NAME} PROPERTIES DISABLED TRUE SKIP_REGULAR_EXPRESSION
+                                                   "MPI required but not found")
       return()
     else()
       # Fallback: run single-process without mpiexec
@@ -107,9 +110,8 @@ function(add_ippl_test TEST_NAME)
     endif()
   endif()
 
-  # Name prefix for nicer grouping: unit.<relpath>.<name>
-  # file(RELATIVE_PATH _rel "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-  # string(REPLACE "/" "." _rel "${_rel}")
+  # Name prefix for nicer grouping: unit.<relpath>.<name> file(RELATIVE_PATH _rel
+  # "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") string(REPLACE "/" "." _rel "${_rel}")
   set(_ctest_name "${TEST_NAME}")
 
   # Register the test
@@ -117,18 +119,14 @@ function(add_ippl_test TEST_NAME)
     add_test(NAME ${_ctest_name} COMMAND ${_final_cmd})
 
     # Base properties
-    set_tests_properties(${_ctest_name} PROPERTIES
-      TIMEOUT ${_timeout}
-      LABELS "${_labels}"
-    )
+    set_tests_properties(${_ctest_name} PROPERTIES TIMEOUT ${_timeout} LABELS "${_labels}")
 
     # Optional working directory
     if(TEST_WORKING_DIRECTORY)
-      set_tests_properties(${_ctest_name} PROPERTIES
-        WORKING_DIRECTORY "${TEST_WORKING_DIRECTORY}")
+      set_tests_properties(${_ctest_name} PROPERTIES WORKING_DIRECTORY "${TEST_WORKING_DIRECTORY}")
     else()
-      set_tests_properties(${_ctest_name} PROPERTIES
-        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+      set_tests_properties(${_ctest_name} PROPERTIES WORKING_DIRECTORY
+                                                     "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
 
     # Run serially if requested