diff --git a/parser.py b/parser.py
index 9c26901..cde25bc 100644
--- a/parser.py
+++ b/parser.py
@@ -104,20 +104,20 @@ class EventParser:
         if team == old_team:
             return None
         
-        warmup = " ^3(warmup)" if data.get('WARMUP', False) else ""
+        warmup = " ^0^3(Warmup)^9" if data.get('WARMUP', False) else ""
         
         team_messages = {
-            'FREE': ' ^7joined the ^2Fight^7',
+            'FREE': ' ^7joined the ^0fight^9',
             'SPECTATOR': ' ^7joined the ^3Spectators^7',
-            'RED': ' ^7joined the ^1Red ^7team',
-            'BLUE': ' ^7joined the ^4Blue ^7team'
+            'RED': ' ^7joined the ^1RED Team^7',
+            'BLUE': ' ^7joined the ^4BLUE Team^7'
         }
         
         old_team_messages = {
-            'FREE': 'the ^2Fight^7',
+            'FREE': 'the ^0fight^9',
             'SPECTATOR': 'the ^3Spectators^7',
-            'RED': '^7the ^1Red ^7team',
-            'BLUE': '^7the ^4Blue ^7team'
+            'RED': '^7the ^1RED Team^7',
+            'BLUE': '^7the ^4BLUE Team^7'
         }
         
         team_msg = team_messages.get(team, f' ^7joined team {team}^7')