diff --git a/pom.xml b/pom.xml
index 66c65bb..b963b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/de/fanta/challenges/ChatUtil.java b/src/main/java/de/fanta/challenges/ChatUtil.java
index 844d75b..ecc69bc 100644
--- a/src/main/java/de/fanta/challenges/ChatUtil.java
+++ b/src/main/java/de/fanta/challenges/ChatUtil.java
@@ -1,6 +1,5 @@
 package de.fanta.challenges;
 
-import de.fanta.challenges.Challenges;
 import de.iani.cubesideutils.bukkit.ChatUtilBukkit;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -16,16 +15,14 @@
     }
 
     public static void sendNormalMessage(CommandSender sender, Object message, Object... messageParts) {
-        sendMessage(sender, ChatColor.GREEN.toString(), message, messageParts);
+        sendMessage(sender, ChatColor.of("#123456").toString(), message, messageParts);
     }
 
     public static void sendWarningMessage(CommandSender sender, Object message, Object... messageParts) {
-        sendMessage(sender, ChatColor.GOLD.toString(), message, messageParts);
+        sendMessage(sender, ChatColor.of("#89A402").toString(), message, messageParts);
     }
 
     public static void sendErrorMessage(CommandSender sender, Object message, Object... messageParts) {
-        sendMessage(sender, ChatColor.RED.toString(), message, messageParts);
+        sendMessage(sender, ChatColor.of("#A73F07").toString(), message, messageParts);
     }
-
-
 }
diff --git a/src/main/java/de/fanta/challenges/Timer.java b/src/main/java/de/fanta/challenges/Timer.java
index a8e23bb..8bf81ac 100644
--- a/src/main/java/de/fanta/challenges/Timer.java
+++ b/src/main/java/de/fanta/challenges/Timer.java
@@ -19,8 +19,8 @@
 
     private final Challenges plugin;
     private final Random random;
-    private int taskId;
-    private int idleTaskId;
+    private int actionBarTaskId;
+    private int idleActionBarTaskId;
 
     private int time; // seconds
     private int timeSinceMLG; // seconds
@@ -39,11 +39,11 @@
     }
 
     public void startTimer() {
-        if (idleTaskId > 0) {
-            Bukkit.getScheduler().cancelTask(idleTaskId);
-            idleTaskId = -1;
+        if (idleActionBarTaskId > 0) {
+            Bukkit.getScheduler().cancelTask(idleActionBarTaskId);
+            idleActionBarTaskId = -1;
         }
-        taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+        actionBarTaskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
             int random = this.random.nextInt(750);
             timeSinceMLG++;
             if (random == 638 || timeSinceMLG >= maxMLGTime) {
@@ -72,16 +72,16 @@
     }
 
     public void stopTimer() {
-        if (taskId > 0) {
-            Bukkit.getScheduler().cancelTask(taskId);
-            taskId = -1;
+        if (actionBarTaskId > 0) {
+            Bukkit.getScheduler().cancelTask(actionBarTaskId);
+            actionBarTaskId = -1;
         }
 
         sendIdleActionBar();
     }
 
     private void sendIdleActionBar() {
-        idleTaskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+        idleActionBarTaskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
             for (Player p : Bukkit.getOnlinePlayers()) {
                 p.sendActionBar(ChatColor.GOLD + "" + ChatColor.BOLD + "Der Timer ist pausiert.");
                 if (p.getGameMode() != GameMode.SPECTATOR) {
@@ -162,7 +162,7 @@
     }
 
     public boolean isRunning() {
-        return taskId > 0;
+        return actionBarTaskId > 0;
     }
 
     public boolean isReverse() {
diff --git a/src/main/java/de/fanta/challenges/events/DeathListener.java b/src/main/java/de/fanta/challenges/events/DeathListener.java
index de4aac7..56a53c9 100644
--- a/src/main/java/de/fanta/challenges/events/DeathListener.java
+++ b/src/main/java/de/fanta/challenges/events/DeathListener.java
@@ -8,6 +8,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Wither;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
@@ -62,7 +63,7 @@
 			Bukkit.broadcastMessage(Challenges.PREFIX);
 			Bukkit.broadcastMessage(Challenges.PREFIX);
 			Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §aDie Challenge wurde §2§lerfolgreich §aabgeschlossen.");
-			Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Der §2§lEnderdrache §7ist gestorben.");
+			Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Der §2§lEnderDragon §7wurde besiegt.");
 			Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Benötigte Zeit: §2§l" + plugin.getTimer().formatTime(ChatColor.GREEN) + "§7!");
 			Bukkit.broadcastMessage(Challenges.PREFIX + " §8>> §7Seed: §2§l" + Bukkit.getWorlds().get(0).getSeed());
 			Bukkit.broadcastMessage(Challenges.PREFIX);
diff --git a/src/main/java/de/fanta/challenges/events/QuitJoinListener.java b/src/main/java/de/fanta/challenges/events/QuitJoinListener.java
index 534ce66..17bdcd8 100644
--- a/src/main/java/de/fanta/challenges/events/QuitJoinListener.java
+++ b/src/main/java/de/fanta/challenges/events/QuitJoinListener.java
@@ -8,8 +8,8 @@
 import java.util.stream.Collectors;
 
 import de.fanta.challenges.ChatUtil;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -23,7 +23,7 @@
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
         Player p = e.getPlayer();
-        Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD + p.getName() + ChatColor.GREEN +  " hat die Lobby betreten! " + ChatColor.BLUE + "[" +  Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]");
+        Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.of("#3D98DC") + p.getName() + ChatColor.of("#1FFF00") +  " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" +  Bukkit.getServer().getOnlinePlayers().size() + "/" + Bukkit.getServer().getMaxPlayers() + "]");
         e.setJoinMessage(null);
         Challenges.getplugin().checkMLGWorld();
         if (plugin.getConfig().getBoolean("sharedmg")) {
@@ -52,7 +52,7 @@
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent e) {
         Player player = e.getPlayer();
-        Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.GOLD +  player.getName() + ChatColor.RED +  " hat die Lobby verlassen! " + ChatColor.BLUE + "[" +  (Bukkit.getServer().getOnlinePlayers().size() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]");
+        Bukkit.broadcastMessage(Challenges.PREFIX + " " + ChatColor.of("#3D98DC") +  player.getName() + ChatColor.of("#C45B3D") +  " hat die Lobby verlassen! " + ChatColor.of("#E4E737") + "[" +  (Bukkit.getServer().getOnlinePlayers().size() - 1) + "/" + Bukkit.getServer().getMaxPlayers() + "]");
         e.setQuitMessage(null);
 
         if (Bukkit.getOnlinePlayers().size() == 1) {