diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index a546955f..25c9004e 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -284,8 +284,8 @@ EVENT_COMING_TEAMS = §7  With§8: {0}
 EVENT_COMING_TEAM = §{0}{1}
 EVENT_CURRENT_EVENT = §e§l{0}
 EVENT_CURRENT_FIGHT_1 = §7{0} §{1}{2}
-EVENT_CURRENT_FIGHT_VS = §8 vs
-EVENT_CURRENT_FIGHT_2 =  §{1}{2}
+EVENT_CURRENT_FIGHT_VS = '§8 vs '
+EVENT_CURRENT_FIGHT_2 = §{0}{1}
 EVENT_CURRENT_FIGHT_WIN = §8: §7Victory §{0}{1}
 EVENT_CURRENT_FIGHT_DRAW = §8: §7Draw
 EVENT_TEAM_TABLE = §{0}{1}{2} §8 with §e{3} §7points
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
index a775d71c..3ac39d6f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.velocitycore.commands;
 
-import com.google.protobuf.MapEntry;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -29,18 +28,15 @@ import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.*;
-import de.steamwar.sql.Event;
 import de.steamwar.velocitycore.EventStarter;
 import de.steamwar.velocitycore.SubserverSystem;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 
-import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;