diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index e20e0d5d6..630edbf93 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -25,7 +25,7 @@ jobs:
         id: clang-format
         continue-on-error: true
         with:
-          clang-format-version: "17"
+          clang-format-version: "18"
           exclude-regex: "incbin"
 
       - name: Comment on PR
@@ -33,9 +33,9 @@ jobs:
         uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # @v2.5.0
         with:
           message: |
-            clang-format 17 needs to be run on this PR.
+            clang-format 18 needs to be run on this PR.
             If you do not have clang-format installed, the maintainer will run it when merging.
-            For the exact version please see https://packages.ubuntu.com/mantic/clang-format-17.
+            For the exact version please see https://packages.ubuntu.com/noble/clang-format-18.
 
             _(execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**)_
           comment_tag: execution
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf9cecda2..caffc916e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ discussion._
 
 Changes to Stockfish C++ code should respect our coding style defined by
 [.clang-format](.clang-format). You can format your changes by running
-`make format`. This requires clang-format version 17 to be installed on your system.
+`make format`. This requires clang-format version 18 to be installed on your system.
 
 ## Navigate
 
diff --git a/src/Makefile b/src/Makefile
index 26640983f..d95f84808 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -156,8 +156,8 @@ dotprod = no
 arm_version = 0
 STRIP = strip
 
-ifneq ($(shell which clang-format-17 2> /dev/null),)
-	CLANG-FORMAT = clang-format-17
+ifneq ($(shell which clang-format-18 2> /dev/null),)
+	CLANG-FORMAT = clang-format-18
 else
 	CLANG-FORMAT = clang-format
 endif
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index afba6363b..fdf35eb17 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -83,10 +83,8 @@ Value Eval::evaluate(const Eval::NNUE::Networks&    networks,
     optimism += optimism * nnueComplexity / 470;
     nnue -= nnue * nnueComplexity / 20000;
 
-    int material = 300 * pos.count<PAWN>() + 350 * pos.count<KNIGHT>() + 400 * pos.count<BISHOP>()
-                 + 640 * pos.count<ROOK>() + 1200 * pos.count<QUEEN>();
-
-    v = (nnue * (34300 + material) + optimism * (4400 + material)) / 36672;
+    int material = 600 * pos.count<PAWN>() + pos.non_pawn_material();
+    v            = (nnue * (68600 + material) + optimism * (8800 + material)) / 73344;
 
     // Damp down the evaluation linearly when shuffling
     v -= v * pos.rule50_count() / 212;