diff --git a/patches/server/0008-Include-server.properties-in-timings.patch b/patches/server/0008-Include-server.properties-in-timings.patch
index 99d61cd..2211633 100644
--- a/patches/server/0008-Include-server.properties-in-timings.patch
+++ b/patches/server/0008-Include-server.properties-in-timings.patch
@@ -113,14 +113,15 @@ index 8f8fd98f96cd390ba43033521982a13044df91cf..dbb0f523608a9208e8c656898b18ce1b
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b8c2d4e74d99d1f955d300d403f519cd68017ac4
+index 0000000000000000000000000000000000000000..9d9ee3f38f04cfc4fcab00b8ff5558e75674da11
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
-@@ -0,0 +1,120 @@
+@@ -0,0 +1,128 @@
 +// Gale - include server.properties in timings
 +
 +package org.galemc.gale.configuration.timingsexport;
 +
++import co.aikar.timings.TimingsExport;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.dedicated.DedicatedServer;
 +import org.galemc.gale.configuration.GaleGlobalConfiguration;
@@ -129,6 +130,13 @@ index 0000000000000000000000000000000000000000..b8c2d4e74d99d1f955d300d403f519cd
 +
 +import java.util.Optional;
 +
++/**
++ * Exports the vanilla server.properties to a JSON object, to be included in a timings report.
++ *
++ * @see TimingsExport
++ *
++ * @author Martijn Muijsers under GPL-3.0
++ */
 +public final class VanillaServerPropertiesTimingsExport {
 +
 +    private VanillaServerPropertiesTimingsExport() {}
@@ -138,7 +146,7 @@ index 0000000000000000000000000000000000000000..b8c2d4e74d99d1f955d300d403f519cd
 +
 +        var json = new JSONObject();
 +        var properties = ((DedicatedServer) MinecraftServer.getServer()).getProperties();
-+        var includeConfig = GaleGlobalConfiguration.get().misc.includeInTimingsReport;
++        var includeConfig = GaleGlobalConfiguration.get().misc.includeInTimingsReport.serverProperties;
 +
 +        json.put("allow-flight", String.valueOf(properties.allowFlight));
 +        json.put("allow-nether", String.valueOf(properties.allowNether));
diff --git a/patches/server/0123-Include-CPU-cores-estimation-in-timings.patch b/patches/server/0123-Include-CPU-cores-estimation-in-timings.patch
new file mode 100644
index 0000000..91b36fa
--- /dev/null
+++ b/patches/server/0123-Include-CPU-cores-estimation-in-timings.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Sat, 24 Dec 2022 22:03:32 +0100
+Subject: [PATCH] Include CPU cores estimation in timings
+
+License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index dc9d304257d86109c06ec9b7673d3ee27d5ee875..32da69dcab868d2fa9775c6384c4403be10c0c97 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -37,6 +37,7 @@ import org.bukkit.configuration.MemorySection;
+ import org.bukkit.entity.EntityType;
+ import org.galemc.gale.configuration.GaleGlobalConfiguration;
+ import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport;
++import org.galemc.gale.util.CPUCoresEstimation;
+ import org.json.simple.JSONObject;
+ import org.json.simple.JSONValue;
+ import oshi.SystemInfo;
+@@ -206,6 +207,10 @@ public class TimingsExport extends Thread {
+                     pair("finalizing", ManagementFactory.getMemoryMXBean().getObjectPendingFinalizationCount())
+                 )),
+                 pair("cpu", runtime.availableProcessors()),
++                // Gale start - include CPU cores estimation in timings
++                pair("cpucoresestimation", CPUCoresEstimation.get()),
++                pair("cpuphysicalprocessorcount", processor.getPhysicalProcessorCount()),
++                // Gale end - include CPU cores estimation in timings
+                 pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()),
+                 pair("hardwarespecs", hardwareSpecsMap), // Gale - include hardware specs in timings
+                 pair("runtime", runtimeBean.getUptime()),
diff --git a/patches/server/0123-Mutex-utility.patch b/patches/server/0124-Mutex-utility.patch
similarity index 100%
rename from patches/server/0123-Mutex-utility.patch
rename to patches/server/0124-Mutex-utility.patch
diff --git a/patches/server/0124-Paired-lock-and-condition-utility.patch b/patches/server/0125-Paired-lock-and-condition-utility.patch
similarity index 100%
rename from patches/server/0124-Paired-lock-and-condition-utility.patch
rename to patches/server/0125-Paired-lock-and-condition-utility.patch
diff --git a/patches/server/0125-Unterminable-executor-utility.patch b/patches/server/0126-Unterminable-executor-utility.patch
similarity index 100%
rename from patches/server/0125-Unterminable-executor-utility.patch
rename to patches/server/0126-Unterminable-executor-utility.patch
diff --git a/patches/server/0126-FIFO-concurrent-queue-utility.patch b/patches/server/0127-FIFO-concurrent-queue-utility.patch
similarity index 100%
rename from patches/server/0126-FIFO-concurrent-queue-utility.patch
rename to patches/server/0127-FIFO-concurrent-queue-utility.patch
diff --git a/patches/server/0127-Base-thread-pools.patch b/patches/server/0128-Base-thread-pools.patch
similarity index 100%
rename from patches/server/0127-Base-thread-pools.patch
rename to patches/server/0128-Base-thread-pools.patch
diff --git a/patches/server/0128-Non-blocking-PooledObjects.patch b/patches/server/0129-Non-blocking-PooledObjects.patch
similarity index 100%
rename from patches/server/0128-Non-blocking-PooledObjects.patch
rename to patches/server/0129-Non-blocking-PooledObjects.patch