diff --git a/patches/server/0236-Config-for-grindstones.patch b/patches/server/0236-Config-for-grindstones.patch
index aea978e13..44c7b4cae 100644
--- a/patches/server/0236-Config-for-grindstones.patch
+++ b/patches/server/0236-Config-for-grindstones.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for grindstones
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 0bdf874ddb951daf8d469575a44144504472d12d..14128f5b2eb7daf0cc7868e90533acd8a0d54935 100644
+index 0bdf874ddb951daf8d469575a44144504472d12d..855ff86696d27f7029ec8bd2558207078a62525b 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -35,23 +35,29 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..14128f5b2eb7daf0cc7868e90533acd8
          }).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
  
          EnchantmentHelper.setEnchantments(map, itemstack1);
-@@ -267,6 +267,14 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+@@ -267,6 +267,20 @@ public class GrindstoneMenu extends AbstractContainerMenu {
              itemstack1.setRepairCost(AnvilMenu.calculateIncreasedRepairCost(itemstack1.getBaseRepairCost()));
          }
  
 +        // Purpur start
 +        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes && itemstack1.getTag() != null) {
 +            for (String key : itemstack1.getTag().getAllKeys()) {
-+                itemstack1.getTag().remove(key);
++                if (!key.equals("display")) {
++                    itemstack1.getTag().remove(key);
++                }
 +            }
 +        }
++
++        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay && itemstack1.getTag() != null) {
++            itemstack1.getTag().remove("display");
++        }
 +        // Purpur end
 +
          return itemstack1;
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 258ef634bac087710c77abff0a52954aa591ddd2..c21e12f1a3e61a3813e678f74e3919a17a662222 100644
+index 258ef634bac087710c77abff0a52954aa591ddd2..adeb257d6c7ec0fc3e390d17820a2ee42b684150 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -4,9 +4,13 @@ import co.aikar.timings.TimingsManager;
@@ -81,16 +87,17 @@ index 258ef634bac087710c77abff0a52954aa591ddd2..c21e12f1a3e61a3813e678f74e3919a1
  import java.util.logging.Level;
  
  @SuppressWarnings("unused")
-@@ -300,6 +307,8 @@ public class PurpurConfig {
+@@ -300,6 +307,9 @@ public class PurpurConfig {
      public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
      public static int lightningRodRange = 128;
 +    public static Set<Enchantment> grindstoneIgnoredEnchants = new HashSet<>();
 +    public static boolean grindstoneRemoveAttributes = false;
++    public static boolean grindstoneRemoveDisplay = false;
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -334,6 +343,18 @@ public class PurpurConfig {
+@@ -334,6 +344,19 @@ public class PurpurConfig {
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
          lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
@@ -106,6 +113,7 @@ index 258ef634bac087710c77abff0a52954aa591ddd2..c21e12f1a3e61a3813e678f74e3919a1
 +            grindstoneIgnoredEnchants.add(enchantment);
 +        });
 +        grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes);
++        grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);
      }
  
      public static boolean allowInfinityMending = false;
diff --git a/patches/server/0237-UPnP-Port-Forwarding.patch b/patches/server/0237-UPnP-Port-Forwarding.patch
index 4a2091d9a..51a3165dc 100644
--- a/patches/server/0237-UPnP-Port-Forwarding.patch
+++ b/patches/server/0237-UPnP-Port-Forwarding.patch
@@ -67,10 +67,10 @@ index 9e83f2dea73461f698185f5ffdb6060e422b9494..6b503d7bdd0eb202ff3466dc1f691102
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c21e12f1a3e61a3813e678f74e3919a17a662222..ee01d9b20e5d16110d57083dcf216cc279e8dfec 100644
+index adeb257d6c7ec0fc3e390d17820a2ee42b684150..dfa5268c43c8c7726b581a6567d32838ac58eb6a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -404,4 +404,9 @@ public class PurpurConfig {
+@@ -406,4 +406,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }
diff --git a/patches/server/0252-Configurable-valid-characters-for-usernames.patch b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
index 67b46f44a..31f704bf0 100644
--- a/patches/server/0252-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
@@ -18,10 +18,10 @@ index 3fa13053722387db199f482307559219c381f4da..fd0f5b13c4254dd976a38a6e60d9e156
              char c = in.charAt(i);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ee01d9b20e5d16110d57083dcf216cc279e8dfec..1a038bac86eb2af4c426556c1738af2b3b7f1045 100644
+index dfa5268c43c8c7726b581a6567d32838ac58eb6a..4aba19f579e2340aa0b8070de33a14483f85235d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -409,4 +409,11 @@ public class PurpurConfig {
+@@ -411,4 +411,11 @@ public class PurpurConfig {
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
      }
diff --git a/patches/server/0253-Shears-can-have-looting-enchantment.patch b/patches/server/0253-Shears-can-have-looting-enchantment.patch
index e3684d61a..f7e2f80a8 100644
--- a/patches/server/0253-Shears-can-have-looting-enchantment.patch
+++ b/patches/server/0253-Shears-can-have-looting-enchantment.patch
@@ -158,10 +158,10 @@ index 6b8a1535086aae7e4e3229d05615fb903188f507..60af917083de1b790b1d93d61835a669
      public int getMinCost(int level) {
          return 15 + (level - 1) * 9;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 1a038bac86eb2af4c426556c1738af2b3b7f1045..f36632cc8a5f842d58922d1a6b2ff41f180897ec 100644
+index 4aba19f579e2340aa0b8070de33a14483f85235d..9f7631b643ebfb3b472bf2fd4280140d0b32cfc5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -359,6 +359,7 @@ public class PurpurConfig {
+@@ -361,6 +361,7 @@ public class PurpurConfig {
  
      public static boolean allowInfinityMending = false;
      public static boolean allowCrossbowInfinity = false;
@@ -169,7 +169,7 @@ index 1a038bac86eb2af4c426556c1738af2b3b7f1045..f36632cc8a5f842d58922d1a6b2ff41f
      public static boolean allowUnsafeEnchants = false;
      private static void enchantmentSettings() {
          if (version < 5) {
-@@ -368,6 +369,7 @@ public class PurpurConfig {
+@@ -370,6 +371,7 @@ public class PurpurConfig {
          }
          allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
          allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);