diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle
index f7ac10ec..047ba10c 100644
--- a/arclight-common/build.gradle
+++ b/arclight-common/build.gradle
@@ -25,6 +25,7 @@ arclight {
     wipeVersion = true
     reobfVersion = false
     accessTransformer = project.file('bukkit.at')
+    packageName = 'spigot'
 }
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
@@ -70,6 +71,12 @@ remapSpigotJar {
     includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory')
 }
 
+processMapping {
+    process { csrg, srg ->
+        csrg.classes.put('net/minecraft/world/level/ColorResolver', "net/minecraft/server/$bukkitVersion/ColorResolver".toString())
+    }
+}
+
 generateArclightMeta {
     doFirst {
         throw new StopExecutionException()
diff --git a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg
index 6103b41e..8c2d109d 100644
--- a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg
+++ b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg
@@ -437,4 +437,7 @@ public net.minecraft.entity.item.TNTEntity field_94084_b
 public net.minecraft.item.ItemUseContext <init>(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockRayTraceResult;)V
 public net.minecraft.server.MinecraftServer field_240767_f_
 public net.minecraft.block.SoundType field_185862_o
-public net.minecraft.block.SoundType field_185865_r
\ No newline at end of file
+public net.minecraft.block.SoundType field_185865_r
+public net.minecraft.entity.LivingEntity func_241353_q_()V
+public net.minecraft.entity.monster.DrownedEntity field_204717_b
+public net.minecraft.entity.monster.DrownedEntity field_204716_a
\ No newline at end of file
diff --git a/arclight-forge-1.16/build.gradle b/arclight-forge-1.16/build.gradle
index e55e2858..806005d2 100644
--- a/arclight-forge-1.16/build.gradle
+++ b/arclight-forge-1.16/build.gradle
@@ -26,6 +26,7 @@ arclight {
     wipeVersion = true
     reobfVersion = true
     accessTransformer = project(':arclight-common').file('bukkit.at')
+    packageName = 'spigot'
 }
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
@@ -141,6 +142,12 @@ remapSpigotJar {
     includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory')
 }
 
+processMapping {
+    process { csrg, srg ->
+        csrg.classes.put('net/minecraft/world/level/ColorResolver', "net/minecraft/server/$bukkitVersion/ColorResolver".toString())
+    }
+}
+
 mixin {
     add sourceSets.main, 'mixins.arclight.impl.refmap.1_16.json'
 }
diff --git a/build.gradle b/build.gradle
index 469ca584..4c2999bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ allprojects {
     version '1.0.19-SNAPSHOT'
 
     ext {
-        agpVersion = '1.16'
+        agpVersion = '1.17'
         minecraftVersion = '1.16.5'
         forgeVersion = '36.1.24'
     }