diff --git a/common/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java b/common/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java
deleted file mode 100755
index 7ee8275..0000000
--- a/common/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package eu.midnightdust.cullleaves;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-
-public class CullLeavesClient {
-
-    public static void onInitializeClient() {
-        CullLeavesConfig.init("cullleaves", CullLeavesConfig.class);
-    }
-}
diff --git a/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java b/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
index 9b3b0c7..72e4029 100755
--- a/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
+++ b/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
@@ -9,9 +9,9 @@ import net.minecraft.block.LeavesBlock;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(LeavesBlock.class)
+@Mixin(value = LeavesBlock.class, priority = 1900)
 @Environment(EnvType.CLIENT)
-public class MixinLeavesBlock extends Block {
+public abstract class MixinLeavesBlock extends Block {
 
     public MixinLeavesBlock(Settings settings) {
         super(settings);
diff --git a/common/src/main/resources/assets/cullleaves/icon.png b/common/src/main/resources/assets/cullleaves/icon.png
old mode 100755
new mode 100644
index 8b0898f..6351cbf
Binary files a/common/src/main/resources/assets/cullleaves/icon.png and b/common/src/main/resources/assets/cullleaves/icon.png differ
diff --git a/common/src/main/resources/resourcepacks/smartleaves/pack.png b/common/src/main/resources/resourcepacks/smartleaves/pack.png
deleted file mode 100755
index 17b7e2a..0000000
Binary files a/common/src/main/resources/resourcepacks/smartleaves/pack.png and /dev/null differ
diff --git a/common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json b/fabric-like/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json
similarity index 100%
rename from common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json
rename to fabric-like/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json
diff --git a/common/src/main/resources/resourcepacks/smartleaves/license.txt b/fabric-like/src/main/resources/resourcepacks/smartleaves/license.txt
similarity index 100%
rename from common/src/main/resources/resourcepacks/smartleaves/license.txt
rename to fabric-like/src/main/resources/resourcepacks/smartleaves/license.txt
diff --git a/common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta b/fabric-like/src/main/resources/resourcepacks/smartleaves/pack.mcmeta
similarity index 100%
rename from common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta
rename to fabric-like/src/main/resources/resourcepacks/smartleaves/pack.mcmeta
diff --git a/fabric-like/src/main/resources/resourcepacks/smartleaves/pack.png b/fabric-like/src/main/resources/resourcepacks/smartleaves/pack.png
new file mode 100644
index 0000000..1a2a35b
Binary files /dev/null and b/fabric-like/src/main/resources/resourcepacks/smartleaves/pack.png differ
diff --git a/fabric/src/main/java/eu/midnightdust/cullleaves/fabric/CullLeavesClientFabric.java b/fabric/src/main/java/eu/midnightdust/cullleaves/fabric/CullLeavesClientFabric.java
index bc20d2f..03bdbdf 100644
--- a/fabric/src/main/java/eu/midnightdust/cullleaves/fabric/CullLeavesClientFabric.java
+++ b/fabric/src/main/java/eu/midnightdust/cullleaves/fabric/CullLeavesClientFabric.java
@@ -1,6 +1,7 @@
 package eu.midnightdust.cullleaves.fabric;
 
-import eu.midnightdust.cullleaves.CullLeavesClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
@@ -10,7 +11,7 @@ import net.minecraft.util.Identifier;
 public class CullLeavesClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        CullLeavesClient.onInitializeClient();
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
         FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), modContainer, ResourcePackActivationType.NORMAL);
         });
diff --git a/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientForge.java b/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientForge.java
index c486fc3..27da0c3 100644
--- a/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientForge.java
+++ b/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientForge.java
@@ -1,6 +1,6 @@
 package eu.midnightdust.cullleaves.forge;
 
-import eu.midnightdust.cullleaves.CullLeavesClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.Mod;
 @Mod("cullleaves")
 public class CullLeavesClientForge {
     public CullLeavesClientForge() {
-        CullLeavesClient.onInitializeClient();
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
         ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
                 new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "cullleaves")));
     }
-}
+}
\ No newline at end of file
diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png
old mode 100755
new mode 100644
index 8b0898f..6351cbf
Binary files a/forge/src/main/resources/icon.png and b/forge/src/main/resources/icon.png differ
diff --git a/quilt/src/main/java/eu/midnightdust/cullleaves/quilt/CullLeavesClientQuilt.java b/quilt/src/main/java/eu/midnightdust/cullleaves/quilt/CullLeavesClientQuilt.java
index df34141..4cc78ef 100644
--- a/quilt/src/main/java/eu/midnightdust/cullleaves/quilt/CullLeavesClientQuilt.java
+++ b/quilt/src/main/java/eu/midnightdust/cullleaves/quilt/CullLeavesClientQuilt.java
@@ -1,6 +1,7 @@
 package eu.midnightdust.cullleaves.quilt;
 
-import eu.midnightdust.cullleaves.CullLeavesClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraft.util.Identifier;
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
@@ -10,7 +11,7 @@ import org.quiltmc.qsl.resource.loader.api.ResourcePackActivationType;
 public class CullLeavesClientQuilt implements ClientModInitializer {
     @Override
     public void onInitializeClient(ModContainer mod) {
-        CullLeavesClient.onInitializeClient();
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
         ResourceLoader.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), mod, ResourcePackActivationType.NORMAL);
     }
 }