diff --git a/patches/server/0001-Kaiiju-Rebranding.patch b/patches/server/0001-Rebranding.patch
similarity index 99%
rename from patches/server/0001-Kaiiju-Rebranding.patch
rename to patches/server/0001-Rebranding.patch
index e9c05d4..7e90019 100644
--- a/patches/server/0001-Kaiiju-Rebranding.patch
+++ b/patches/server/0001-Rebranding.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 02:58:46 +0200
-Subject: [PATCH] Kaiiju Rebranding
+Subject: [PATCH] Rebranding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,7 +48,7 @@ index 58dc84b7b3b04c2d0b00fc5fac5303d3378b3467..a128b1fabd4aadfe26a8375903c0451d
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 719b0e318a85d4a1fb8f616deeb31193495b462e..751b2bc79d29cb21c38cf5d35e3711149ec7b011 100644
+index 2ce29b6ccb9a3b520b8c1edf53aae2e9769ba252..f675fcae235a8c2722d9bba65d5e1292c5b76deb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 @@ -19,10 +19,11 @@ import java.util.stream.StreamSupport;
diff --git a/patches/server/0002-Kaiiju-Configuration.patch b/patches/server/0002-Empty-configuration.patch
similarity index 99%
rename from patches/server/0002-Kaiiju-Configuration.patch
rename to patches/server/0002-Empty-configuration.patch
index 1673997..60042f1 100644
--- a/patches/server/0002-Kaiiju-Configuration.patch
+++ b/patches/server/0002-Empty-configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 05:53:10 +0200
-Subject: [PATCH] Kaiiju Configuration
+Subject: [PATCH] Empty configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
@@ -432,7 +432,7 @@ index 7abd4f38ae59a6019137345af960fd60a3c7adf0..426777730f77664c69bd0a084a9323d7
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c7c682cd2d1498e6d6521ddd62acdc1168bfe152..53b9444ff6120628d23ad27fc87d9cd9bdf66648 100644
+index afb3d0fa48b7fd6d273361c6dc32764b5d35c356..a3b4b49ca8612a61bc2e7a1e2d2e942e7ebe1883 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -453,7 +453,7 @@ index c7c682cd2d1498e6d6521ddd62acdc1168bfe152..53b9444ff6120628d23ad27fc87d9cd9
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b1680507c05547458e1199412ab97105b67f8973..d1468cb0ae1850719d40524dad9b14fbdb0f79a1 100644
+index 176f3acec268dad80cc90029edd88e7a0c3e8885..48f946243af24a9d4847f6a7a59449136cf6ee83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1067,6 +1067,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch b/patches/server/0003-Region-format-configuration.patch
similarity index 98%
rename from patches/server/0003-Kaiiju-RegionFormat-Configuration.patch
rename to patches/server/0003-Region-format-configuration.patch
index 9ab3560..e0af83e 100644
--- a/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch
+++ b/patches/server/0003-Region-format-configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 20:03:58 +0200
-Subject: [PATCH] Kaiiju RegionFormat Configuration
+Subject: [PATCH] Region format configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
diff --git a/patches/server/0004-Kaiiju-RegionFormat-Linear.patch b/patches/server/0004-Add-Linear-region-format.patch
similarity index 99%
rename from patches/server/0004-Kaiiju-RegionFormat-Linear.patch
rename to patches/server/0004-Add-Linear-region-format.patch
index adfd066..6b2ab4a 100644
--- a/patches/server/0004-Kaiiju-RegionFormat-Linear.patch
+++ b/patches/server/0004-Add-Linear-region-format.patch
@@ -1,8 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 22:21:56 +0200
-Subject: [PATCH] Kaiiju RegionFormat Linear
+Subject: [PATCH] Add Linear region format
 
+Linear is a region file format that uses ZSTD compression instead of
+ZLIB.
+This format saves about 50% of disk space.
 Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools
 
 diff --git a/build.gradle.kts b/build.gradle.kts
diff --git a/patches/server/0005-Kaiiju-Network-Configuration.patch b/patches/server/0005-Network-configuration.patch
similarity index 94%
rename from patches/server/0005-Kaiiju-Network-Configuration.patch
rename to patches/server/0005-Network-configuration.patch
index 8a26228..191343d 100644
--- a/patches/server/0005-Kaiiju-Network-Configuration.patch
+++ b/patches/server/0005-Network-configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Thu, 16 Feb 2023 01:38:59 +0200
-Subject: [PATCH] Kaiiju Network Configuration
+Subject: [PATCH] Network configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
diff --git a/patches/server/0006-Purpur-Network-SendNullEntityPackets.patch b/patches/server/0006-Send-null-entity-packets.patch
similarity index 96%
rename from patches/server/0006-Purpur-Network-SendNullEntityPackets.patch
rename to patches/server/0006-Send-null-entity-packets.patch
index 2f1ce50..71ce899 100644
--- a/patches/server/0006-Purpur-Network-SendNullEntityPackets.patch
+++ b/patches/server/0006-Send-null-entity-packets.patch
@@ -1,8 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Thu, 16 Feb 2023 01:49:54 +0200
-Subject: [PATCH] Purpur Network SendNullEntityPackets
+Subject: [PATCH] Send null entity packets
 
+This is from Purpur. Don't send null entity packets.
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 index 7c6d43d8a360530344ef296f4477750c8a298607..ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7 100644
diff --git a/patches/server/0007-Purpur-Network-AlternateKeepalive.patch b/patches/server/0007-Alternate-Keepalive.patch
similarity index 97%
rename from patches/server/0007-Purpur-Network-AlternateKeepalive.patch
rename to patches/server/0007-Alternate-Keepalive.patch
index d8f045d..9eba312 100644
--- a/patches/server/0007-Purpur-Network-AlternateKeepalive.patch
+++ b/patches/server/0007-Alternate-Keepalive.patch
@@ -1,8 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 31 Mar 2023 01:52:44 +0300
-Subject: [PATCH] Purpur Network AlternateKeepalive
+Subject: [PATCH] Alternate Keepalive
 
+Don't kick players because 1 keepalive is lost.
+This patch is from Purpur.
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 index ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7..b42a3466f145a92608c8746fd4beb529b4a60b01 100644
diff --git a/patches/server/0008-Kaiiju-Gameplay-Configuration.patch b/patches/server/0008-Gameplay-Configuration.patch
similarity index 96%
rename from patches/server/0008-Kaiiju-Gameplay-Configuration.patch
rename to patches/server/0008-Gameplay-Configuration.patch
index 14553a1..37a08eb 100644
--- a/patches/server/0008-Kaiiju-Gameplay-Configuration.patch
+++ b/patches/server/0008-Gameplay-Configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Sat, 8 Apr 2023 23:32:34 +0300
-Subject: [PATCH] Kaiiju Gameplay Configuration
+Subject: [PATCH] Gameplay Configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
diff --git a/patches/server/0009-Kaiiju-Gameplay-ShulkerDropContentsWhenDestroyed.patch b/patches/server/0009-Shulker-drop-contents-when-destroyed.patch
similarity index 92%
rename from patches/server/0009-Kaiiju-Gameplay-ShulkerDropContentsWhenDestroyed.patch
rename to patches/server/0009-Shulker-drop-contents-when-destroyed.patch
index 28df261..ceea3fb 100644
--- a/patches/server/0009-Kaiiju-Gameplay-ShulkerDropContentsWhenDestroyed.patch
+++ b/patches/server/0009-Shulker-drop-contents-when-destroyed.patch
@@ -1,8 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Xymb <xymb@endcrystal.me>
 Date: Sat, 8 Apr 2023 23:38:13 +0300
-Subject: [PATCH] Kaiiju Gameplay ShulkerDropContentsWhenDestroyed
+Subject: [PATCH] Shulker drop contents when destroyed
 
+Don't drop shulker contents when shulker items are destroyed (by cactus,
+lava..)
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
 index 73d79fe0077b28db2f9e7fa13a1ae6eff9abd6a9..bac11b0e30a86d0689693ff129b53bcad7c2034c 100644
diff --git a/patches/server/0010-Purpur-Gameplay-ServerModName.patch b/patches/server/0010-Server-mod-name.patch
similarity index 97%
rename from patches/server/0010-Purpur-Gameplay-ServerModName.patch
rename to patches/server/0010-Server-mod-name.patch
index a22736a..1c86a1f 100644
--- a/patches/server/0010-Purpur-Gameplay-ServerModName.patch
+++ b/patches/server/0010-Server-mod-name.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Sun, 9 Apr 2023 17:06:46 +0300
-Subject: [PATCH] Purpur Gameplay ServerModName
+Subject: [PATCH] Server mod name
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
diff --git a/patches/server/0011-Kaiiju-Linear-CrashOnBrokenSymlink.patch b/patches/server/0011-Crash-on-broken-symlink.patch
similarity index 99%
rename from patches/server/0011-Kaiiju-Linear-CrashOnBrokenSymlink.patch
rename to patches/server/0011-Crash-on-broken-symlink.patch
index d541950..92900b6 100644
--- a/patches/server/0011-Kaiiju-Linear-CrashOnBrokenSymlink.patch
+++ b/patches/server/0011-Crash-on-broken-symlink.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Xymb <xymb@endcrystal.me>
 Date: Fri, 14 Apr 2023 02:12:58 +0200
-Subject: [PATCH] Kaiiju Linear CrashOnBrokenSymlink
+Subject: [PATCH] Crash on broken symlink
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
@@ -42,7 +42,7 @@ index a62a1b281bd0b6ad7d59b45b9470d84f496f6539..7f87dfa131ab7d40a94cf6355765478f
          long expectedChunks = (long)regionFiles.length * (32L * 32L);
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 43503974433c4d1808b2acb2b79f46d640725dc0..73ac94eaebdeaa94c83f1f23b53e686d867e6f98 100644
+index 5ad209fed6aef1992af0472ac0af0911d178a260..0ef89e0bc214364fd904c3e5022c660b32b2caaa 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -272,7 +272,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0012-Purpur-Gameplay-FixVoidTrading.patch b/patches/server/0012-Toggle-void-trading.patch
similarity index 91%
rename from patches/server/0012-Purpur-Gameplay-FixVoidTrading.patch
rename to patches/server/0012-Toggle-void-trading.patch
index d6f1c68..932b351 100644
--- a/patches/server/0012-Purpur-Gameplay-FixVoidTrading.patch
+++ b/patches/server/0012-Toggle-void-trading.patch
@@ -1,8 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Sun, 23 Apr 2023 15:34:30 +0300
-Subject: [PATCH] Purpur Gameplay FixVoidTrading
+Subject: [PATCH] Toggle void trading
 
+Don't close trading windows when the villager is unloaded.
+You should set chunk-unloads to 0s in paper config file to enable void
+trading. Or use Kaiivoid plugin.
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
 index 0f0cfd958f7d2c6d2ca4192be1b986900a2bfa53..c267b0cd52448246c7701081028ff0986dde2fa2 100644
diff --git a/patches/server/0013-Kaiiju-Gameplay-OptimizeHoppersToggle.patch b/patches/server/0013-Toggle-optimize-hoppers.patch
similarity index 98%
rename from patches/server/0013-Kaiiju-Gameplay-OptimizeHoppersToggle.patch
rename to patches/server/0013-Toggle-optimize-hoppers.patch
index f6b745c..07fce27 100644
--- a/patches/server/0013-Kaiiju-Gameplay-OptimizeHoppersToggle.patch
+++ b/patches/server/0013-Toggle-optimize-hoppers.patch
@@ -1,8 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Thu, 27 Apr 2023 03:49:08 +0300
-Subject: [PATCH] Kaiiju Gameplay OptimizeHoppersToggle
+Subject: [PATCH] Toggle optimize hoppers
 
+Paper optimize hoppers patch break a lot of technical redstone farms because of piston updates. (Example: twiti888 wood farm)
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
 index c267b0cd52448246c7701081028ff0986dde2fa2..2624e074e0a14f5e05aca8fa910b5e5d71f320a9 100644