diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
index cd34f121..a775d71c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
@@ -186,22 +186,29 @@ public class EventCommand extends SWCommand {
             for (EventFight eventFight : dates.get(dates.keySet().toArray()[page - 1])) {
                 Team blue = Team.byId(eventFight.getTeamBlue());
                 Team red = Team.byId(eventFight.getTeamRed());
-                StringBuilder fline = new StringBuilder(sender.parseToLegacy("EVENT_CURRENT_FIGHT", eventFight.getStartTime().toLocalDateTime().format(format), blue.getTeamColor(), blue.getTeamKuerzel(), red.getTeamColor(), red.getTeamKuerzel()));
+                Component finalfightline = sender.parse("EVENT_CURRENT_FIGHT_1", eventFight.getStartTime().toLocalDateTime().format(format), blue.getTeamColor(), blue.getTeamKuerzel());
+                finalfightline = finalfightline.clickEvent(ClickEvent.runCommand("/team info " + blue.getTeamName()));
+                Component vs = sender.parse("EVENT_CURRENT_FIGHT_VS");
+                finalfightline = finalfightline.append(vs);
+                Component redteam = sender.parse("EVENT_CURRENT_FIGHT_2", red.getTeamColor(), red.getTeamKuerzel());
+                redteam = redteam.clickEvent(ClickEvent.runCommand("/team info " + red.getTeamName()));
+                finalfightline = finalfightline.append(redteam);
 
                 if (eventFight.hasFinished()) {
+                    Component ergebnis;
                     switch (eventFight.getErgebnis()) {
                         case 1:
-                            fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_WIN", blue.getTeamColor(), blue.getTeamKuerzel()));
+                            ergebnis = sender.parse("EVENT_CURRENT_FIGHT_WIN", blue.getTeamColor(), blue.getTeamKuerzel());
                             break;
                         case 2:
-                            fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_WIN", red.getTeamColor(), red.getTeamKuerzel()));
+                            ergebnis = sender.parse("EVENT_CURRENT_FIGHT_WIN", red.getTeamColor(), red.getTeamKuerzel());
                             break;
                         default:
-                            fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_DRAW"));
+                            ergebnis = sender.parse("EVENT_CURRENT_FIGHT_DRAW");
                     }
+                    finalfightline = finalfightline.append(ergebnis);
                 }
-
-                sender.prefixless("PLAIN_STRING", fline.toString());
+                sender.sendMessage(finalfightline);
             }
         }
         return dates.size();