diff --git a/build.gradle.kts b/build.gradle.kts
index eb9a4fa..21ecdc5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,11 +79,16 @@ allprojects {
 
         modCompileOnly(libs.bundles.common.compile)
 
-        annotationProcessor(libs.mixin.squared)
+        annotationProcessor(libs.mixin.squared) {
+            exclude(module = "fabric-loader")
+        }
         modImplementation(libs.bundles.common.bundle)
         if (project !in excluded) {
             include(libs.bundles.common.bundle)
         }
+
+        annotationProcessor(libs.mixin.extras)
+        modCompileOnly(libs.mixin.extras)
     }
 
     tasks {
diff --git a/fabric/src/client/resources/joy.client.fabric.mixins.json b/fabric/src/client/resources/joy.client.fabric.mixins.json
index bc3e6b2..63396b3 100644
--- a/fabric/src/client/resources/joy.client.fabric.mixins.json
+++ b/fabric/src/client/resources/joy.client.fabric.mixins.json
@@ -3,6 +3,7 @@
   "minVersion": "0.8",
   "package": "gay.pridecraft.joy.fabric.client.mixin",
   "plugin": "gay.pridecraft.joy.fabric.client.MixinPlugin",
+  "refmap": "client-joy.refmap.json",
   "compatibilityLevel": "JAVA_21",
   "client": [
     "mavapi.EntityBucketItemMixin"
diff --git a/fabric/src/main/resources/joy.fabric.mixins.json b/fabric/src/main/resources/joy.fabric.mixins.json
index f9ece03..2664e2c 100644
--- a/fabric/src/main/resources/joy.fabric.mixins.json
+++ b/fabric/src/main/resources/joy.fabric.mixins.json
@@ -2,6 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "gay.pridecraft.joy.fabric.client.mixin",
+  "refmap": "joy.refmap.json",
   "compatibilityLevel": "JAVA_21",
   "injectors": {
     "defaultRequire": 1
diff --git a/gradle.properties b/gradle.properties
index 8564745..12238ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-version=1.0.0-alpha.1
+version=1.0.0-alpha.3
 group=gay.pridecraft
 id=joy
 
diff --git a/libs.versions.toml b/libs.versions.toml
index e86e1e5..4e5326b 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -36,6 +36,7 @@ lib39 = "1.5.0-experimental7+1.20.1"
 # Libraries
 annotations = "23.+"
 mixin = "0.15.0+mixin.0.8.7"
+mixin-extras = "0.4.1"
 mixin-squared = "0.2.0"
 
 testng = "7.5.1"
@@ -76,6 +77,7 @@ lib39-ripple = { module = "com.unascribed:lib39-ripple", version.ref = "lib39" }
 
 annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
 mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
+mixin-extras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixin-extras" }
 mixin-squared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-fabric", version.ref = "mixin-squared" }
 
 testng = { module = "org.testng:testng", version.ref = "testng" }
diff --git a/xplat/src/client/resources/joy.client.mixins.json b/xplat/src/client/resources/joy.client.mixins.json
index 2722c6d..228755b 100644
--- a/xplat/src/client/resources/joy.client.mixins.json
+++ b/xplat/src/client/resources/joy.client.mixins.json
@@ -2,12 +2,13 @@
   "required": true,
   "minVersion": "0.8",
   "package": "gay.pridecraft.joy.mixin.client",
+  "refmap": "client-joy.refmap.json",
   "compatibilityLevel": "JAVA_21",
   "client": [
     "BipedEntityModelMixin",
     "ClientPlayNetworkHandlerMixin",
     "PlayerEntityRendererMixin",
-    "SplashTextResourceSupplierMixin",
+    "SplashTextResourceSupplierMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/xplat/src/main/resources/joy.mixins.json b/xplat/src/main/resources/joy.mixins.json
index 6c457d3..666caa9 100644
--- a/xplat/src/main/resources/joy.mixins.json
+++ b/xplat/src/main/resources/joy.mixins.json
@@ -2,6 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "gay.pridecraft.joy.mixin",
+  "refmap": "joy.refmap.json",
   "compatibilityLevel": "JAVA_21",
   "mixins": ["AllayEntityMixin", "LivingEntityMixin", "PaintingVariantsMixin"],
   "injectors": {