diff --git a/patches/server/0006-Leaves-Server-Config-And-Command.patch b/patches/server/0006-Leaves-Server-Config-And-Command.patch
index eb7784f6..0623ec90 100644
--- a/patches/server/0006-Leaves-Server-Config-And-Command.patch
+++ b/patches/server/0006-Leaves-Server-Config-And-Command.patch
@@ -23,18 +23,6 @@ index 5025c5df3ee6ed84106782e3f9228874bebe63ca..268193499b9f1fae0c01963e8004a3e7
  tasks.registerRunTask("runBundler") {
      description = "Spin up a test server from the Mojang mapped bundler jar"
      classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip })
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41ed8d64963616fc97d382b6cd0b9cc154fd84c6..1b8f7ff3b0ccef6ce3ac99eecf98622fb13f9269 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1168,6 +1168,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
-             // Paper end
- 
-+			org.leavesmc.leaves.LeavesConfig.createWorldSections = false; // Leaves - dont let plugin create worlds fill our config
-             org.spigotmc.WatchdogThread.tick(); // Paper
-             org.spigotmc.WatchdogThread.hasStarted = true; // Paper
-             Arrays.fill( this.recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 29d61b407762504dffc26f3048a17327592d9b4a..ec9ade19778c71561b4045ade5ab6cd090768547 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -97,10 +85,10 @@ index 459f47244bdfeab63b5f16d780b0291d36310de8..a872421bc3e67fdcc929f104f4b085fb
                          .withRequiredArg()
 diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2a7f9d9fdb72786b08b3cb216f5aa5e5eac3c967
+index 0000000000000000000000000000000000000000..9e82ab6e85288a7fb32a86478fe91a142225bdd0
 --- /dev/null
 +++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-@@ -0,0 +1,922 @@
+@@ -0,0 +1,927 @@
 +package org.leavesmc.leaves;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -138,7 +126,6 @@ index 0000000000000000000000000000000000000000..2a7f9d9fdb72786b08b3cb216f5aa5e5
 +    private static File configFile;
 +    public static YamlConfiguration config;
 +    private static int configVersion;
-+    public static boolean createWorldSections = true;
 +
 +    public static void init(final File file) {
 +        LeavesConfig.configFile = file;
@@ -370,6 +357,12 @@ index 0000000000000000000000000000000000000000..2a7f9d9fdb72786b08b3cb216f5aa5e5
 +    @GlobalConfig(name = "protection-stacking", category = {"modify", "minecraft-old"})
 +    public static boolean protectionStacking = false;
 +
++    @GlobalConfig(name = "allow-grindstone-overstacking", category = {"modify", "minecraft-old"})
++    public static boolean allowGrindstoneOverstacking = false;
++
++    @GlobalConfig(name = "allow-entity-portal-with-passenger", category = {"modify", "minecraft-old"})
++    public static boolean allowEntityPortalWithPassenger = true;
++
 +    // Leaves end - modify - minecraft-old
 +
 +    // Leaves start - modify - elytra-aeronautics
diff --git a/patches/server/0007-Leaves-Protocol-Core.patch b/patches/server/0007-Leaves-Protocol-Core.patch
index 80609aa9..760d28d0 100644
--- a/patches/server/0007-Leaves-Protocol-Core.patch
+++ b/patches/server/0007-Leaves-Protocol-Core.patch
@@ -47,10 +47,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
  
          assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1b8f7ff3b0ccef6ce3ac99eecf98622fb13f9269..307c5a0b4b7c68fe2c7d1cf77ff23c766335882d 100644
+index 41ed8d64963616fc97d382b6cd0b9cc154fd84c6..2d60beb706f99e0c570caf37ccc777e69c672ef2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1736,6 +1736,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1735,6 +1735,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.profiler.popPush("server gui refresh");
  
diff --git a/patches/server/0024-Config-to-disable-method-profiler.patch b/patches/server/0024-Config-to-disable-method-profiler.patch
index 81ffd4f4..1aa6f425 100644
--- a/patches/server/0024-Config-to-disable-method-profiler.patch
+++ b/patches/server/0024-Config-to-disable-method-profiler.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 803d0b817e5d0acb1e4c6601d4784cc5cbd5e612..bef6e9e9871d6ab7ad1fbb72d1735cc411b9cc93 100644
+index 2b29dacb541468d4f6410402c2e4eb1a57b80e2a..c35d6ed30fee7a684d1b68ec179eee6aa5a0b33d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2484,6 +2484,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2483,6 +2483,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
diff --git a/patches/server/0050-Fix-update-suppression-crash.patch b/patches/server/0050-Fix-update-suppression-crash.patch
index e471c269..d1bc8c88 100644
--- a/patches/server/0050-Fix-update-suppression-crash.patch
+++ b/patches/server/0050-Fix-update-suppression-crash.patch
@@ -20,10 +20,10 @@ index f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233..8909f4f65864935f86608b0e00149c57
                          if (exception instanceof ReportedException) {
                              ReportedException reportedexception = (ReportedException) exception;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 25e4fd107eefdd3c1420d6a1af541de9b6aa8b2c..906542486e8e5d1242137a654bd102edb774adb8 100644
+index 139255c1528cb7164f4a814812c49a4c0855992a..d225b9d5853422397f7a7ecb4705de1386e3edab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1715,7 +1715,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1714,7 +1714,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
diff --git a/patches/server/0051-Bedrock-break-list.patch b/patches/server/0051-Bedrock-break-list.patch
index 162fa32a..8965bfe4 100644
--- a/patches/server/0051-Bedrock-break-list.patch
+++ b/patches/server/0051-Bedrock-break-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 906542486e8e5d1242137a654bd102edb774adb8..5206abff6edc9e56d4671b8b36c409c71cf12eb0 100644
+index d225b9d5853422397f7a7ecb4705de1386e3edab..e4298f95cde4b6297ceb789cd59db599cdd0b653 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1747,6 +1747,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1746,6 +1746,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
  
diff --git a/patches/server/0097-Replay-Mod-API.patch b/patches/server/0097-Replay-Mod-API.patch
index d94f4dee..5fd80119 100644
--- a/patches/server/0097-Replay-Mod-API.patch
+++ b/patches/server/0097-Replay-Mod-API.patch
@@ -108,10 +108,10 @@ index c8d39e6e1c570c9219f6066da273dc0130920519..96a074281d16a7f64058619da4b102f3
                              if (((List) object).size() >= i) {
                                  return (List) object;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6dbc31ef1e5b8716e200a64835cf12f9c8232d25..6a5650024b8d6aca49aa98d69af68195d6d43bb0 100644
+index e4298f95cde4b6297ceb789cd59db599cdd0b653..a2a88f4d547bba8dc20a9216d1942f609faa00e0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1619,7 +1619,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1618,7 +1618,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {
diff --git a/patches/server/0126-MCOld-allow-grindstone-overstacking.patch b/patches/server/0126-Allow-grindstone-overstacking.patch
similarity index 59%
rename from patches/server/0126-MCOld-allow-grindstone-overstacking.patch
rename to patches/server/0126-Allow-grindstone-overstacking.patch
index 45e7abfe..1f45b9c0 100644
--- a/patches/server/0126-MCOld-allow-grindstone-overstacking.patch
+++ b/patches/server/0126-Allow-grindstone-overstacking.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
 Date: Wed, 26 Jun 2024 17:59:56 +0800
-Subject: [PATCH] MCOld-allow-grindstone-overstacking
+Subject: [PATCH] Allow grindstone overstacking
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 1678f6c8b2c7db761783e53043169bf12bc2cb29..4bfea8b5139a10a3dd76d56159a1914a5ddc7c8f 100644
+index 1678f6c8b2c7db761783e53043169bf12bc2cb29..13cfda7c065e0332133a1e1b60b454ae44e87d35 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -202,7 +202,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -22,21 +22,7 @@ index 1678f6c8b2c7db761783e53043169bf12bc2cb29..4bfea8b5139a10a3dd76d56159a1914a
  
              if (slot == 2) {
 -                if (!this.moveItemStackTo(itemstack1, 3, 39, true)) {
-+                if (!this.moveItemStackTo(itemstack1, 3, 39, true, true)) { // Leaves - allowGrindstoneOverstacking: Disable stack check
++                if (!this.moveItemStackTo(itemstack1, 3, 39, true, org.leavesmc.leaves.LeavesConfig.allowGrindstoneOverstacking)) { // Leaves - allowGrindstoneOverstacking: Disable stack check
                      return ItemStack.EMPTY;
                  }
  
-diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-index 2a7f9d9fdb72786b08b3cb216f5aa5e5eac3c967..6ad969d47898199bfa2d73ecda3d26d3c4719520 100644
---- a/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-+++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-@@ -918,5 +918,8 @@ public final class LeavesConfig {
-     @GlobalConfig(name = "vanilla-hopper", category = "fix")
-     public static boolean vanillaHopper = false;
- 
--    // Leaves end - region
-+    @GlobalConfig(name = "allow-grindstone-overstacking", category = "fix")
-+    public static boolean allowGrindstoneOverstacking = false;
-+
-+    // Leaves end - fix
- }
diff --git a/patches/server/0127-Configurable-MC-67.patch b/patches/server/0127-Configurable-MC-67.patch
new file mode 100644
index 00000000..85c84f24
--- /dev/null
+++ b/patches/server/0127-Configurable-MC-67.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
+Date: Wed, 26 Jun 2024 18:15:57 +0800
+Subject: [PATCH] Configurable MC-67
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index b450c19fbb6cc7266db4ddc4bc86546ca2054d5a..64356adabfab88e76a1df9c1ff4d9112e61e8b09 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3753,7 +3753,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     }
+ 
+     public boolean canChangeDimensions(Level from, Level to) {
+-        return this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues
++        return !(!org.leavesmc.leaves.LeavesConfig.allowEntityPortalWithPassenger && (this.isPassenger() || this.isVehicle())) && this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues // Leaves - allowEntityPortalWithPassenger
+     }
+ 
+     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/patches/server/0127-MCOld-MC-67.patch b/patches/server/0127-MCOld-MC-67.patch
deleted file mode 100644
index 70d96fcb..00000000
--- a/patches/server/0127-MCOld-MC-67.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
-Date: Wed, 26 Jun 2024 18:15:57 +0800
-Subject: [PATCH] MCOld-MC-67
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b450c19fbb6cc7266db4ddc4bc86546ca2054d5a..69d2ee3bd4e89968da219f27231af241c88b3600 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3753,7 +3753,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public boolean canChangeDimensions(Level from, Level to) {
--        return this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues
-+        return !(this.isPassenger() || this.isVehicle() && !org.leavesmc.leaves.LeavesConfig.allowEntityPortalWithPassenger) && this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues // Leaves - allowEntityPortalWithPassenger
-     }
- 
-     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
-diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-index 6ad969d47898199bfa2d73ecda3d26d3c4719520..799fa0e780431cd690b86f3340850dd85a2e4884 100644
---- a/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-+++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-@@ -921,5 +921,7 @@ public final class LeavesConfig {
-     @GlobalConfig(name = "allow-grindstone-overstacking", category = "fix")
-     public static boolean allowGrindstoneOverstacking = false;
- 
-+    @GlobalConfig(name = "allow-entity-portal-with-passenger", category = "fix")
-+    public static boolean allowEntityPortalWithPassenger = true;
-     // Leaves end - fix
- }