diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
index 872646a..c77c0ca 100644
--- a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -4,6 +4,7 @@ import com.alttd.chat.VelocityChat;
 import com.alttd.chat.api.GlobalAdminChatEvent;
 import com.alttd.chat.api.PrivateMessageEvent;
 import com.alttd.chat.config.Config;
+import com.alttd.chat.util.Utility;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
@@ -30,16 +31,13 @@ public class ChatListener {
 
     @Subscribe(order = PostOrder.FIRST)
     public void onGlobalStaffChat(GlobalAdminChatEvent event) {
-        String senderName;
-        String serverName;
+        String senderName = Config.CONSOLENAME;
+        String serverName = "Altitude";
         CommandSource commandSource = event.getSender();
         if (commandSource instanceof Player) {
             Player sender = (Player) event.getSender();
             senderName = sender.getUsername();
             serverName = sender.getCurrentServer().isPresent() ? sender.getCurrentServer().get().getServerInfo().getName() : "Altitude";
-        } else {
-            senderName = "Console"; // TODO console name from config
-            serverName = "Proxy";
         }
 
         MiniMessage miniMessage = MiniMessage.get();
@@ -47,7 +45,8 @@ public class ChatListener {
         Map<String, String> map = new HashMap<>();
 
         map.put("sender", senderName);
-        map.put("message", event.getMessage());
+        //map.put("message", event.getMessage());
+        map.put("message", Utility.parseColors(event.getMessage()));
         map.put("server", serverName);
 
         Component message = miniMessage.parse(Config.GACFORMAT, map);
diff --git a/velocity/src/main/java/com/alttd/chat/util/Regex.java b/velocity/src/main/java/com/alttd/chat/util/Regex.java
index 4c3ef0a..7115b16 100644
--- a/velocity/src/main/java/com/alttd/chat/util/Regex.java
+++ b/velocity/src/main/java/com/alttd/chat/util/Regex.java
@@ -15,6 +15,7 @@ import java.util.regex.Pattern;
 
 public class Regex {
 
+    // todo move this to API!
     private static final HashMap<Pattern, ArrayList<String>> cancelRegex = new HashMap<>();
     private static final HashMap<String, String> replaceRegex = new HashMap<>();