diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java
index 4f89c5b..40781ac 100644
--- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java
+++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java
@@ -19,6 +19,8 @@
 import de.iani.cubesideutils.StringUtil;
 import de.iani.cubesideutils.bukkit.inventory.AbstractWindow;
 import de.iani.cubesideutils.bukkit.items.ItemGroups;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
@@ -35,18 +37,14 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Registry;
 import org.bukkit.Sound;
+import org.bukkit.Tag;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Animals;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Dolphin;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.IronGolem;
-import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Wither;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -173,10 +171,8 @@
                     }
                 }
 
-                for (Biome biome : Biome.values()) {
-                    if (biome != Biome.CUSTOM) {
-                        biomes.add(biome);
-                    }
+                for (Biome biome : RegistryAccess.registryAccess().getRegistry(RegistryKey.BIOME)) {
+                    biomes.add(biome);
                 }
 
                 for (EntityType entityType : EntityType.values()) {
@@ -229,10 +225,12 @@
                 for (Scorable scorable : plugin.getScoreManager().getByPositon(1)) {
                     OfflinePlayer p = (Bukkit.getServer().getOfflinePlayer(scorable.getName()));
                     if (p.isOnline()) {
-                        Component[] lines = {Component.empty(), Component.empty(), Component.empty(), Component.text("    " + p.getName(), Color.BLUE), Component.text("    hat " + plugin.getScoreManager().getScore(scorable) + " Aufgaben erledigt", Color.GREEN), Component.text("    und hat damit gewonnen!", Color.GREEN), Component.empty(), Component.empty()};
+                        Component[] lines = { Component.empty(), Component.empty(), Component.empty(), Component.text("    " + p.getName(), Color.BLUE), Component.text("    hat " + plugin.getScoreManager().getScore(scorable) + " Aufgaben erledigt", Color.GREEN),
+                                Component.text("    und hat damit gewonnen!", Color.GREEN), Component.empty(), Component.empty() };
                         ChatSkull.sendAll((Player) p, lines);
                     } else {
-                        plugin.getComponentUtil().sendBrodCastMessage(Component.text(scorable.getName(), Color.BLUE).append(Component.text(" hat ", Color.GREEN).append(Component.text(plugin.getScoreManager().getScore(scorable), Color.BLUE).append(Component.text(" Aufgaben erledigt und hat damit gewonnen!", Color.GREEN)))));
+                        plugin.getComponentUtil().sendBrodCastMessage(
+                                Component.text(scorable.getName(), Color.BLUE).append(Component.text(" hat ", Color.GREEN).append(Component.text(plugin.getScoreManager().getScore(scorable), Color.BLUE).append(Component.text(" Aufgaben erledigt und hat damit gewonnen!", Color.GREEN)))));
                     }
                 }
 
@@ -375,7 +373,6 @@
             return null;
         }
 
-
         for (QuestType questType : playerQuestTypes) {
             PROBABILITY_MAP.put(MAX_PROBABILITY, questType);
             MAX_PROBABILITY += questType.getProbability();
@@ -596,6 +593,13 @@
                     if (e.getSlot() == 40) { //Slot 40 == Offhand
                         e.setCancelled(true);
                     }
+                    if (Tag.ITEMS_BUNDLES.isTagged(e.getClickedInventory().getItem(e.getSlot()).getType())) {
+                        e.setCancelled(true);
+                    }
+
+                    if (Tag.ITEMS_BUNDLES.isTagged(e.getCursor().getType())) {
+                        e.setCancelled(true);
+                    }
                 }
                 case MOVE_TO_OTHER_INVENTORY -> {
                     if (!(e.getInventory() instanceof CraftingInventory)) {
@@ -678,7 +682,6 @@
             }
             removeArmorStand(e.getEntity());
 
-
             Player player = e.getPlayer();
             QuestType questType = playerQuest.get(player.getUniqueId());
             if (questType == QuestType.ForceDeath) {
@@ -959,7 +962,6 @@
             case ForceStructure -> stack = new ItemStack(Material.FILLED_MAP);
         }
 
-
         if (!player.getPassengers().isEmpty()) {
             for (Entity entity : player.getPassengers()) {
                 if (entity instanceof ArmorStand stand) {
@@ -1114,7 +1116,7 @@
             case ForceMob -> {
                 EntityType entityType = entityTypeByPlayerList.get(player.getUniqueId());
                 if (entityType != null) {
-                    bossBarTitle = bossBarTitle.append(Component.text("Töte die Kreatur " , Color.GREEN).append(Component.translatable(entityType, Color.BLUE)));
+                    bossBarTitle = bossBarTitle.append(Component.text("Töte die Kreatur ", Color.GREEN).append(Component.translatable(entityType, Color.BLUE)));
                 }
             }
             case ForceEffect -> {
@@ -1362,10 +1364,8 @@
             for (int i = 0; i < getInventory().getSize(); i++) {
                 ItemStack item;
                 switch (i) {
-                    case YES_INDEX ->
-                            item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", Color.GREEN), true);
-                    case NO_INDEX ->
-                            item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", Color.RED), true);
+                    case YES_INDEX -> item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", Color.GREEN), true);
+                    case NO_INDEX -> item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", Color.RED), true);
 
                     default -> item = ItemUtils.EMPTY_ICON;
                 }
diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java
index 81779af..ac22167 100644
--- a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java
+++ b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java
@@ -41,11 +41,9 @@
         for (int i = 0; i < INVENTORY_SIZE; i++) {
             ItemStack item;
             switch (i) {
-                case JA_INDEX ->
-                        item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", Color.GREEN), true);
+                case JA_INDEX -> item = ItemUtils.createGuiItem(Material.LIME_CONCRETE, Component.text("Ja", Color.GREEN), true);
                 case ITEM_INDEX -> item = playerItemList.get(getPlayer().getUniqueId());
-                case NEIN_INDEX ->
-                        item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", Color.RED), true);
+                case NEIN_INDEX -> item = ItemUtils.createGuiItem(Material.RED_CONCRETE, Component.text("Nein", Color.RED), true);
                 default -> item = ItemUtils.EMPTY_ICON;
             }
             this.getInventory().setItem(i, item);