diff --git a/build.gradle b/build.gradle
index b40083d9..a85f4311 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 def local_bclib = findProject(':BCLib') != null
+def local_wunderlib = findProject(':WunderLib') != null
 
 repositories {
     maven { url "https://maven.dblsaiko.net/" }
@@ -89,7 +90,7 @@ dependencies {
     if (local_bclib) {
         implementation(project(path: ":BCLib", configuration: 'dev'))
     } else {
-        modImplementation "maven.modrinth:BCLib:${project.bclib_version}"
+        modImplementation "com.github.quiqueck:BCLib:${project.bclib_version}"
     }
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
@@ -99,6 +100,11 @@ dependencies {
     modCompileOnly "dev.emi:trinkets:${project.trinkets_version}"
     modCompileOnly "dev.emi:emi:${emi_version}"
     //modRuntimeOnly "dev.emi:emi:${emi_version}"
+
+    if (local_wunderlib) {
+        println "Using local WunderLib"
+        implementation project(path: ":WunderLib", configuration: 'dev')
+    }
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
index c5136d7d..b340e50e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,13 +13,13 @@ modrinth_versions=["1.19.4"]
 release_channel=beta
 modrinth_id=betterend
 # Mod Properties
-mod_version=3.2.1
+mod_version=3.2.2
 maven_group=org.betterx.betterend
 archives_base_name=better-end
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 patchouli_version=1.19-73-FABRIC
-bclib_version=2.3.3
+bclib_version=features~wunderlib-SNAPSHOT
 rei_version=11.0.597
 emi_version=0.7.3+1.19.4
 trinkets_version=3.6.0
diff --git a/settings.gradle b/settings.gradle
index 030f897f..dae78703 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,18 +18,20 @@ def allowLocalLibInConsoleMode = false
 
 //The path were to look for the local BCLib
 def BCLibPath = '../BCLib'
+def WunderLibPath = '../WunderLib'
 
 
 // #### Logic ####
-def isIDE = properties.containsKey('android.injected.invoked.from.ide') 
-            || (System.getenv("XPC_SERVICE_NAME") ?: "").contains("intellij")
-            || (System.getenv("XPC_SERVICE_NAME") ?: "").contains(".idea") 
-            || System.getenv("IDEA_INITIAL_DIRECTORY") != null
+def isIDE = properties.containsKey('android.injected.invoked.from.ide')
+        || (System.getenv("XPC_SERVICE_NAME") ?: "").contains("intellij")
+        || (System.getenv("XPC_SERVICE_NAME") ?: "").contains(".idea")
+        || System.getenv("IDEA_INITIAL_DIRECTORY") != null
 
 println "IntelliJ: ${isIDE}"
 
-def BCLibFolder = new File( BCLibPath )
-if( allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode)  && BCLibFolder.exists() ) {
+def BCLibFolder = new File(BCLibPath)
+def WunderLibFolder = new File(WunderLibPath)
+if (allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode) && BCLibFolder.exists()) {
     println "Using local BCLib from '${BCLibFolder}' in IntelliJ"
     println "If you do not want to load the local version of BClib"
     println "either rename the Folder containing BCLib to something"
@@ -42,5 +44,9 @@ if( allowLocalLibUse && (isIDE || allowLocalLibInConsoleMode)  && BCLibFolder.ex
 
     include ':BCLib'
     project(":BCLib").projectDir = BCLibFolder
-    project(':BCLib').buildFileName = './bclib-composit.gradle'    
+    project(':BCLib').buildFileName = './bclib-composit.gradle'
+
+    include ':WunderLib'
+    project(":WunderLib").projectDir = WunderLibFolder
+    project(':WunderLib').buildFileName = './wunderlib-composit.gradle'
 } 
diff --git a/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java b/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java
index f39bfd94..4edd600d 100644
--- a/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java
+++ b/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java
@@ -1,5 +1,7 @@
 package org.betterx.betterend.integration.emi;
 
+import de.ambertation.wunderlib.ui.layout.components.render.RenderHelper;
+
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.GuiComponent;
@@ -11,7 +13,6 @@ import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.widget.Bounds;
 import dev.emi.emi.api.widget.SlotWidget;
 import dev.emi.emi.config.EmiConfig;
-import org.wunder.lib.ui.layout.components.render.RenderHelper;
 
 public class TransparentSlotWidget extends SlotWidget {