diff --git a/src/de/steamwar/bungeecore/commands/AlertCommand.java b/src/de/steamwar/bungeecore/commands/AlertCommand.java
index 9befd065..e1ac773b 100644
--- a/src/de/steamwar/bungeecore/commands/AlertCommand.java
+++ b/src/de/steamwar/bungeecore/commands/AlertCommand.java
@@ -37,11 +37,6 @@ public class AlertCommand extends BasicCommand {
             return;
         }
 
-        StringBuilder msgBuilder = new StringBuilder();
-        msgBuilder.append(BungeeCore.CHAT_PREFIX);
-        for (String arg : args){
-            msgBuilder.append(arg).append(" ");
-        }
-        Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', msgBuilder.toString()));
+        Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', BungeeCore.CHAT_PREFIX + String.join(" ", args)));
     }
 }
diff --git a/src/de/steamwar/bungeecore/commands/BanCommand.java b/src/de/steamwar/bungeecore/commands/BanCommand.java
index 0899c63a..d49ba646 100644
--- a/src/de/steamwar/bungeecore/commands/BanCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BanCommand.java
@@ -55,7 +55,7 @@ public class BanCommand extends BasicCommand {
             banReason.append(args[i]).append(" ");
         }
         String msg = banReason.toString();
-        Message.send("BAN_YOU_BANNED", sender, target.getUserGroup(), msg);
+        Message.send("BAN_MESSAGE_YOU", sender, target.getUserName(), msg);
         target.ban(banTime, msg);
     }
 
@@ -73,7 +73,7 @@ public class BanCommand extends BasicCommand {
                     Date parsedDate = dateFormat.parse(arg.split("_")[0]);
                     return new java.sql.Timestamp(parsedDate.getTime());
                 }catch(ParseException exception){
-                    Message.send("BAN_INVALID_TIME", sender);
+                    Message.send("INVALID_TIME", sender);
                     return null;
                 }
             }
diff --git a/src/de/steamwar/bungeecore/commands/BugCommand.java b/src/de/steamwar/bungeecore/commands/BugCommand.java
index 74ff27c5..2f607853 100644
--- a/src/de/steamwar/bungeecore/commands/BugCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BugCommand.java
@@ -40,6 +40,6 @@ public class BugCommand extends BasicCommand {
         String message = String.join(" ", args);
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
         SWException.log(server, message, player.getName() + " " + user.getId());
-        Message.send("BUG_SAVED", player);
+        Message.send("BUG_MESSAGE", player);
     }
 }
diff --git a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java b/src/de/steamwar/bungeecore/commands/IgnoreCommand.java
index ef10839e..51459664 100644
--- a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java
+++ b/src/de/steamwar/bungeecore/commands/IgnoreCommand.java
@@ -47,15 +47,17 @@ public class IgnoreCommand extends BasicCommand {
         if(target == null){
             Message.send("UNKNWON_PLAYER", p);
             return;
-        }else if(target.equals(user)){
+        }
+        if(target.equals(user)){
             Message.send("IGNORE_YOURSELF", p);
             return;
-        }else if(IgnoreSystem.isIgnored(user, target)){
+        }
+        if(IgnoreSystem.isIgnored(user, target)){
             Message.send("IGNORE_ALREADY", p);
             return;
         }
 
         IgnoreSystem.ignore(user, target);
-        Message.send("IGNORE_IGNORE", p, target.getUserName());
+        Message.send("IGNORE_MESSAGE", p, target.getUserName());
     }
 }
diff --git a/src/de/steamwar/bungeecore/commands/MuteCommand.java b/src/de/steamwar/bungeecore/commands/MuteCommand.java
index dc0d681e..0d8e344d 100644
--- a/src/de/steamwar/bungeecore/commands/MuteCommand.java
+++ b/src/de/steamwar/bungeecore/commands/MuteCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
 
@@ -34,7 +35,7 @@ public class MuteCommand extends BasicCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if(args.length < 3){
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/mute [Spieler] [dd.mm.yyyy oder dd.mm.yyyy_hh:mm oder perma] [Grund]");
+            Message.send("USAGE_MUTE", sender);
             return;
         }
 
@@ -51,7 +52,7 @@ public class MuteCommand extends BasicCommand {
             muteReason.append(args[i]).append(" ");
         }
         String msg = muteReason.toString();
-        BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gemuted. Grund: §c" + msg);
+        Message.send("MUTE_MESSAGE_YOU", sender, target.getUserName(), msg);
         target.mute(muteTime, msg);
     }
 }
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 64916c90..82a71a45 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -2,6 +2,7 @@ PREFIX=§eSteam§8War»
 
 UNKNOWN_COMMAND=§cUnbekannter Befehl.
 UNKNWON_PLAYER=§cDiesen Spieler gibt es nicht.
+INVALID_TIME=§cUngültige Zeitangabe.
 
 #Help command
 HELP_LOBBY=§7Kehre von überall mit §8/§el §7zur Lobby zurück!
@@ -61,16 +62,18 @@ HELP_BAU_BAU_HOVER=§eNützliche Zusatzfunktionen
 #Usage description of various commands
 USAGE_ALERT=§8/§7alert §8[§eNachricht§8]
 USAGE_BAN=§8/§7ban §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
+USAGE_MUTE=§8/§7mute §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
 USAGE_IGNORE=§8/§7ignore §8[§eSpieler§8]
 
 #Various commands
 ALERT=§f{0}
 
-BAN_YOU_BANNED=§7Du hast §e{0} §7gebannt§8. §7Grund§8: §c{1}
-BAN_INVALID_TIME=§cUngültige Zeitangabe.
+BAN_MESSAGE_YOU=§7Du hast §e{0} §7gebannt§8. §7Grund§8: §c{1}
 
-BUG_SAVED=§7Dein Bugreport wurde gespeichert.
+MUTE_MESSAGE_YOU=§7Du hast §e{0} §7gemutet§8. §7Grund§8: §c{1}
+
+BUG_MESSAGE=§7Dein Bugreport wurde gespeichert.
 
 IGNORE_YOURSELF=§cWie willst du dich selber ignorieren?
 IGNORE_ALREADY=§cDu ignorierst diesen Spieler bereits.
-IGNORE_IGNORE=§7Du ignorierst nun §e{0}§8.
\ No newline at end of file
+IGNORE_MESSAGE=§7Du ignorierst nun §e{0}§8.
\ No newline at end of file