diff --git a/build.gradle.kts b/build.gradle.kts
index 260ab5e..89f9bf4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,7 +85,7 @@ tasks.register("foliaRefLatest") {
         )
 
         val foliaLatestCommitJson = layout.cache.resolve("foliaLatestCommit.json");
-        download.get().download("https://api.github.com/repos/PaperMC/Folia/commits/dev/1.20", foliaLatestCommitJson);
+        download.get().download("https://api.github.com/repos/PaperMC/Folia/commits/master", foliaLatestCommitJson);
         val foliaLatestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(foliaLatestCommitJson)["sha"].asString;
 
         copy {
diff --git a/gradle.properties b/gradle.properties
index a1552ef..c5ffc8c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju
 version = 1.20.1-R0.1-SNAPSHOT
 mcVersion = 1.20.1
 
-foliaRef = fa018cc37228f81347c5824274bd1e31c123be13
+foliaRef = 7c6e2514d2ecd9f5f7db911aab29bfe7f373eb9e
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Rebranding.patch b/patches/server/0001-Rebranding.patch
index 361dee4..c95d3af 100644
--- a/patches/server/0001-Rebranding.patch
+++ b/patches/server/0001-Rebranding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0bbdb3f47b674d0553eaf083b709f1ded3b5bff7..6d6b1973783604369c7ff95d552c43edf149a46a 100644
+index 215366d7cc3720805d2dfde0662372ecede8383c..24f16ac70f993b9645ff01473633f542e57b0fc0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,7 +8,7 @@ plugins {
@@ -17,7 +17,7 @@ index 0bbdb3f47b674d0553eaf083b709f1ded3b5bff7..6d6b1973783604369c7ff95d552c43ed
      implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
      }
-@@ -67,7 +67,7 @@ tasks.jar {
+@@ -68,7 +68,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -154,7 +154,7 @@ index 11ff1bc559316da426070867f045720ebd8c1962..cc1a7c4d38874ec218f7151685ae6cc0
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1e6b90260e0244a6ec9268544fe48449a5a4c80..70c2d9f7519401f6362c16101127d0af51fa77ee 100644
+index 20af7484bf570d28cd9723fdbb1ec07657117367..753594551faa1bff4317386c3df927f486900dab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0002-Empty-configuration.patch b/patches/server/0002-Empty-configuration.patch
index 6f71f5e..6218797 100644
--- a/patches/server/0002-Empty-configuration.patch
+++ b/patches/server/0002-Empty-configuration.patch
@@ -451,10 +451,10 @@ index 8cf4428d8140fd03f0ad8fa1d148a04d8caefda8..fb71843793e699b2ccfaa3b7e4c2bb7d
          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 70c2d9f7519401f6362c16101127d0af51fa77ee..2ea6ce4798db8b8bfdf11e7577fef9446c59f5af 100644
+index 753594551faa1bff4317386c3df927f486900dab..714db83db78d5bd66d8353bf9b8c4a6b1734fce4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1090,6 +1090,7 @@ public final class CraftServer implements Server {
+@@ -1094,6 +1094,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -462,7 +462,7 @@ index 70c2d9f7519401f6362c16101127d0af51fa77ee..2ea6ce4798db8b8bfdf11e7577fef944
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1105,6 +1106,7 @@ public final class CraftServer implements Server {
+@@ -1109,6 +1110,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -470,7 +470,7 @@ index 70c2d9f7519401f6362c16101127d0af51fa77ee..2ea6ce4798db8b8bfdf11e7577fef944
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1120,6 +1122,7 @@ public final class CraftServer implements Server {
+@@ -1124,6 +1126,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -478,7 +478,7 @@ index 70c2d9f7519401f6362c16101127d0af51fa77ee..2ea6ce4798db8b8bfdf11e7577fef944
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2889,6 +2892,13 @@ public final class CraftServer implements Server {
+@@ -2893,6 +2896,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
diff --git a/patches/server/0018-Add-SIMD-utilities.patch b/patches/server/0018-Add-SIMD-utilities.patch
index 4c98e39..ca5959d 100644
--- a/patches/server/0018-Add-SIMD-utilities.patch
+++ b/patches/server/0018-Add-SIMD-utilities.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add SIMD utilities
 Patch from Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a26cc214dccab8c9422f9a45e2a5eeda374c0ead..d5d3fbdeb24b4ac1666247bfe5094431cf22ee56 100644
+index f213706442537201de0d74ca8a51cc93cb9d5220..1615346024037f2abe0fcfcfc5ea7713505bebca 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -59,6 +59,12 @@ dependencies {
+@@ -60,6 +60,12 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_20_R1" // Paper