diff --git a/README.md b/README.md
index a511f40..82d75af 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ Listeners that are implemented by this plugin:
     - also shows players that are op in the display name
 - PlayerQuitEvent (print a beautified quit message "<< PlayerName")
 - PlayerChatEvent (deprecated, but beautify chat messages "PlayerName: message")
-- EntityDamageEvent (show who got how much damage from whom)
 
 And all that in beautiful colors!
 
diff --git a/pom.xml b/pom.xml
index 48c7877..43d0627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>de.privacynerd</groupId>
   <artifactId>ChatBeautifier</artifactId>
-  <version>0.1.0</version>
+  <version>0.2.1</version>
   <packaging>jar</packaging>
 
   <name>ChatBeautifier</name>
diff --git a/src/main/java/de/privacynerd/chatbeautifier/ChatBeautifier.java b/src/main/java/de/privacynerd/chatbeautifier/ChatBeautifier.java
index 7ce0d17..02537a9 100644
--- a/src/main/java/de/privacynerd/chatbeautifier/ChatBeautifier.java
+++ b/src/main/java/de/privacynerd/chatbeautifier/ChatBeautifier.java
@@ -3,6 +3,8 @@ package de.privacynerd.chatbeautifier;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import de.privacynerd.chatbeautifier.commands.*;
+import de.privacynerd.chatbeautifier.guis.*;
 
 
 public final class ChatBeautifier extends JavaPlugin {
@@ -25,8 +27,8 @@ public final class ChatBeautifier extends JavaPlugin {
         log("JoinQuitListener has been registered.");
         pluginManager.registerEvents(new ChatListener(), this);
         log("ChatListener has been registered.");
-        pluginManager.registerEvents(new DamageListener(), this);
-        log("DamageListener has been registered.");
+
+        Bukkit.getPluginCommand("set-chat-color").setExecutor(new ChatColorCommand());
 
         log("Plugin enabled.");
     }
diff --git a/src/main/java/de/privacynerd/chatbeautifier/DamageListener.java b/src/main/java/de/privacynerd/chatbeautifier/DamageListener.java
deleted file mode 100644
index 5462129..0000000
--- a/src/main/java/de/privacynerd/chatbeautifier/DamageListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.privacynerd.chatbeautifier;
-
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Server;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageEvent;
-
-public class DamageListener implements Listener {
-
-    @EventHandler
-    public void onPlayerGetDamage(EntityDamageEvent event) {
-        Entity player1 = event.getEntity();
-        if(!(player1 instanceof Player)){
-            return;
-        }
-        Player player = (Player) player1;
-        Server server = Bukkit.getServer();
-
-        Component message = Component.text(ChatColor.BOLD + "§4[Schaden] " + ChatColor.WHITE + "Der Spieler " + player.getDisplayName() + ChatColor.WHITE + " hat durch \n" + ChatColor.AQUA + event.getCause() + " " + ChatColor.RED + event.getDamage() / 2 + " Herzen " + ChatColor.WHITE + "Schaden bekommen");
-
-        server.broadcast(message);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/de/privacynerd/chatbeautifier/commands/ChatColorCommand.java b/src/main/java/de/privacynerd/chatbeautifier/commands/ChatColorCommand.java
new file mode 100644
index 0000000..798244a
--- /dev/null
+++ b/src/main/java/de/privacynerd/chatbeautifier/commands/ChatColorCommand.java
@@ -0,0 +1,26 @@
+package de.privacynerd.chatbeautifier.commands;
+
+import de.privacynerd.chatbeautifier.ChatBeautifier;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class ChatColorCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+        ChatBeautifier.INSTANCE.log("Command /set-chat-name executed");
+
+        if(!(commandSender instanceof Player)) {
+            ChatBeautifier.INSTANCE.log("Du bist kein Spieler.");
+            return true;
+        }
+        Player player = (Player) commandSender;
+
+        player.sendMessage(Component.text("Dieses Kommando befindet sich noch in der Mache!"));
+
+        return true;
+    }
+}
diff --git a/src/main/java/de/privacynerd/chatbeautifier/guis/ChooseChatColor.java b/src/main/java/de/privacynerd/chatbeautifier/guis/ChooseChatColor.java
new file mode 100644
index 0000000..e9b9ca1
--- /dev/null
+++ b/src/main/java/de/privacynerd/chatbeautifier/guis/ChooseChatColor.java
@@ -0,0 +1,5 @@
+package de.privacynerd.chatbeautifier.guis;
+
+public class ChooseChatColor {
+
+}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 950762c..07477c3 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,3 +2,9 @@ name: ChatBeautifier
 version: '${project.version}'
 main: de.privacynerd.chatbeautifier.ChatBeautifier
 api-version: '1.20'
+
+commands:
+  set-chat-color:
+    description: Mit diesem Befehl kannst du die Farbe deines Namens setzen.
+    aliases: ["scc"]
+    usage: /set-chat-color
\ No newline at end of file
diff --git a/target/ChatBeautifier-0.2.0.jar b/target/ChatBeautifier-0.2.0.jar
new file mode 100644
index 0000000..13d728d
Binary files /dev/null and b/target/ChatBeautifier-0.2.0.jar differ
diff --git a/target/ChatBeautifier-0.2.1.jar b/target/ChatBeautifier-0.2.1.jar
new file mode 100644
index 0000000..9b86976
Binary files /dev/null and b/target/ChatBeautifier-0.2.1.jar differ
diff --git a/target/original-ChatBeautifier-0.2.0.jar b/target/original-ChatBeautifier-0.2.0.jar
new file mode 100644
index 0000000..529efe8
Binary files /dev/null and b/target/original-ChatBeautifier-0.2.0.jar differ
diff --git a/target/original-ChatBeautifier-0.2.1.jar b/target/original-ChatBeautifier-0.2.1.jar
new file mode 100644
index 0000000..f6856d6
Binary files /dev/null and b/target/original-ChatBeautifier-0.2.1.jar differ