diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
index ea84b33b0..5d75b1718 100644
--- a/bukkit/build.gradle.kts
+++ b/bukkit/build.gradle.kts
@@ -31,8 +31,8 @@ repositories {
     maven("https://repo.auxilor.io/repository/maven-public/")
     // EssentialsX
     maven("https://repo.essentialsx.net/releases/")
-    // EvenMoreFish TODO fix when they stop publishing 20 MB fat jar (it breaks annotations and not limited to)
-    //maven("https://repo.codemc.io/repository/EvenMoreFish/")
+    // EvenMoreFish
+    maven("https://repo.codemc.io/repository/EvenMoreFish/")
     // FancyNpcs
     maven("https://repo.fancyinnovations.com/releases")
     // MMOItems, MythicLib
@@ -99,8 +99,8 @@ dependencies {
     compileOnlyPlugin("com.willfp:libreforge:4.21.1")
     // EssentialsX
     compileOnlyPlugin("net.essentialsx:EssentialsX:2.19.7")
-    // EvenMoreFish TODO fix when they stop publishing 20 MB fat jar (it breaks annotations and not limited to)
-    //compileOnlyPlugin("com.oheers.evenmorefish:even-more-fish-plugin:2.0.7")
+    // EvenMoreFish
+    compileOnlyPlugin("com.oheers.evenmorefish:even-more-fish-api:2.1.2")
     // FancyNpcs
     compileOnlyPlugin("de.oliver:FancyNpcs:2.5.1")
     // IridiumSkyblock TODO fix whenever repo is up
diff --git a/bukkit/libs/even-more-fish-plugin-2.0.7.jar b/bukkit/libs/even-more-fish-plugin-2.0.7.jar
deleted file mode 100644
index 1fd30feba..000000000
Binary files a/bukkit/libs/even-more-fish-plugin-2.0.7.jar and /dev/null differ
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
index c6d9257d4..781dacab3 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -507,8 +507,8 @@ public void onEnable() {
             taskTypeManager.registerTaskType(() -> new EcoMobsKillingTaskType(this), () -> CompatUtils.isPluginEnabled("EcoMobs"));
             taskTypeManager.registerTaskType(() -> new EssentialsBalanceTaskType(this), () -> CompatUtils.isPluginEnabled("Essentials"));
             taskTypeManager.registerTaskType(() -> new EssentialsMoneyEarnTaskType(this), () -> CompatUtils.isPluginEnabled("Essentials"));
-            taskTypeManager.registerTaskType(() -> new EvenMoreFishFishingTaskType(this), () -> CompatUtils.isPluginEnabled("EvenMoreFish")); // not tested
-            taskTypeManager.registerTaskType(() -> new EvenMoreFishHuntingTaskType(this), () -> CompatUtils.isPluginEnabled("EvenMoreFish")); // not tested
+            taskTypeManager.registerTaskType(() -> new EvenMoreFishFishingTaskType(this), () -> CompatUtils.isPluginEnabled("EvenMoreFish") && CompatUtils.classExists("com.oheers.fish.api.events.EMFFishCaughtEvent")); // not tested
+            taskTypeManager.registerTaskType(() -> new EvenMoreFishHuntingTaskType(this), () -> CompatUtils.isPluginEnabled("EvenMoreFish") && CompatUtils.classExists("com.oheers.fish.api.events.EMFFishHuntEvent")); // not tested
             taskTypeManager.registerTaskType(() -> new FabledSkyBlockLevelTaskType(this), () -> CompatUtils.isPluginEnabled("FabledSkyBlock")); // not tested
             taskTypeManager.registerTaskType(() -> new FancyNpcsDeliverTaskType(this), () -> CompatUtils.isPluginEnabled("FancyNpcs"));
             taskTypeManager.registerTaskType(() -> new FancyNpcsInteractTaskType(this), () -> CompatUtils.isPluginEnabled("FancyNpcs"));
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/EvenMoreFishQuestItem.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/EvenMoreFishQuestItem.java
index c190e6cde..985c74597 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/EvenMoreFishQuestItem.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/EvenMoreFishQuestItem.java
@@ -1,7 +1,7 @@
 package com.leonardobishop.quests.bukkit.item;
 
-import com.oheers.fish.EvenMoreFish;
-import com.oheers.fish.fishing.items.Fish;
+import com.oheers.fish.api.fishing.items.AbstractFishManager;
+import com.oheers.fish.api.fishing.items.IFish;
 import org.bukkit.inventory.ItemStack;
 
 public class EvenMoreFishQuestItem extends QuestItem {
@@ -17,17 +17,13 @@ public EvenMoreFishQuestItem(final String id, final String rarityName, final Str
 
     @Override
     public ItemStack getItemStack() {
-        final Fish fish = EvenMoreFish.getInstance()
-                .getApi()
-                .getFish(this.rarityName, this.fishName);
+        final IFish fish = AbstractFishManager.getInstance().getFish(this.rarityName, this.fishName);
         return fish != null ? fish.give() : null;
     }
 
     @Override
     public boolean compareItemStack(final ItemStack other, final boolean exactMatch) {
-        final Fish fish = EvenMoreFish.getInstance()
-                .getApi()
-                .getFish(other);
+        final IFish fish = AbstractFishManager.getInstance().getFish(other);
         return fish != null
                 && fish.getRarity().getId().equals(this.rarityName)
                 && fish.getName().equals(this.fishName);
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishTaskType.java
index 4057298c7..df606ad37 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishTaskType.java
@@ -8,7 +8,7 @@
 import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
 import com.leonardobishop.quests.common.quest.Task;
-import com.oheers.fish.fishing.items.Fish;
+import com.oheers.fish.api.fishing.items.IFish;
 import org.bukkit.entity.Player;
 
 public abstract class EvenMoreFishFishTaskType extends BukkitTaskType {
@@ -25,7 +25,7 @@ public EvenMoreFishFishTaskType(String type, String author, String description,
         this.addConfigValidator(TaskUtils.useEnumConfigValidator(this, TaskUtils.StringMatchMode.class, "rarity-match-mode", null, false));
     }
 
-    protected void handle(Player player, Fish fish) {
+    protected void handle(Player player, IFish fish) {
         if (player.hasMetadata("NPC")) {
             return;
         }
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishingTaskType.java
index 00d930b8b..3dbeb422d 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishingTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishFishingTaskType.java
@@ -2,7 +2,7 @@
 
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
-import com.oheers.fish.api.EMFFishEvent;
+import com.oheers.fish.api.events.EMFFishCaughtEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
@@ -13,7 +13,7 @@ public EvenMoreFishFishingTaskType(BukkitQuestsPlugin plugin) {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onEMFFish(EMFFishEvent event) {
+    public void onEMFFish(EMFFishCaughtEvent event) {
         this.handle(event.getPlayer(), event.getFish());
     }
 }
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishHuntingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishHuntingTaskType.java
index e03d032a1..eb71adcc3 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishHuntingTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EvenMoreFishHuntingTaskType.java
@@ -2,7 +2,7 @@
 
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.util.TaskUtils;
-import com.oheers.fish.api.EMFFishHuntEvent;
+import com.oheers.fish.api.events.EMFFishHuntEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;