diff --git a/_entWatch4/scripting/entWatch-messages.sp b/_entWatch4/scripting/entWatch-messages.sp
index 3a94f9d3..b5e4bc08 100644
--- a/_entWatch4/scripting/entWatch-messages.sp
+++ b/_entWatch4/scripting/entWatch-messages.sp
@@ -13,7 +13,7 @@
 #include <sourcemod>
 #include <entWatch_core>
 
-//#define MESSAGEFORMAT "\x07%s[entWatch] \x07%s%s \x07%s(\x07%s%s\x07%s) %t \x07%s%s"
+#define MESSAGEFORMAT "\x07%s[entWatch] \x07%s%s \x07%s(\x07%s%s\x07%s) %s \x07%6s%s"
 
 //----------------------------------------------------------------------------------------------------
 // Purpose:
@@ -39,17 +39,25 @@ public void OnPluginStart()
 //----------------------------------------------------------------------------------------------------
 public void EW_OnClientItemDrop(int client, int index)
 {
-/*	if (itemArray[item_display] & DISPLAY_CHAT)
+	CItem item = EW_GetItemData(index);
+
+	if (item.dConfig.bDisplayEventMessages)
 	{
-		char sName[32];
-		GetClientName(client, sName, sizeof(sName));
+		char sClientName[32];
+		GetClientName(client, sClientName, sizeof(sClientName));
 
-		char sAuth[32];
-		GetClientAuthId(client, AuthId_Steam2, sAuth, sizeof(sAuth));
+		char sClientAuth[32];
+		GetClientAuthId(client, AuthId_Steam2, sClientAuth, sizeof(sClientAuth));
 
-		CRemoveTags(sName, sizeof(sName));
-		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sName, "E562BA", "B2B2B2", sAuth, "E562BA", "Item Drop", itemArray[item_color], itemArray[item_name]);
-	}*/
+		char sItemName[32];
+		item.dConfig.GetName(sItemName, sizeof(sItemName));
+
+		char sItemColor[6];
+		item.dConfig.GetColor(sItemColor, sizeof(sItemColor));
+
+		CRemoveTags(sClientName, sizeof(sClientName));
+		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sClientName, "E562BA", "B2B2B2", sClientAuth, "E562BA", "Item Drop", sItemColor, sItemName);
+	}
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -57,17 +65,25 @@ public void EW_OnClientItemDrop(int client, int index)
 //----------------------------------------------------------------------------------------------------
 public void EW_OnClientItemDeath(int client, int index)
 {
-/*	if (itemArray[item_display] & DISPLAY_CHAT)
+	CItem item = EW_GetItemData(index);
+
+	if (item.dConfig.bDisplayEventMessages)
 	{
-		char sName[32];
-		GetClientName(client, sName, sizeof(sName));
+		char sClientName[32];
+		GetClientName(client, sClientName, sizeof(sClientName));
 
-		char sAuth[32];
-		GetClientAuthId(client, AuthId_Steam2, sAuth, sizeof(sAuth));
+		char sClientAuth[32];
+		GetClientAuthId(client, AuthId_Steam2, sClientAuth, sizeof(sClientAuth));
 
-		CRemoveTags(sName, sizeof(sName));
-		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sName, "F1B567", "B2B2B2", sAuth, "F1B567", "Item Death", itemArray[item_color], itemArray[item_name]);
-	}*/
+		char sItemName[32];
+		item.dConfig.GetName(sItemName, sizeof(sItemName));
+
+		char sItemColor[6];
+		item.dConfig.GetColor(sItemColor, sizeof(sItemColor));
+
+		CRemoveTags(sClientName, sizeof(sClientName));
+		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sClientName, "F1B567", "B2B2B2", sClientAuth, "F1B567", "Item Death", sItemColor, sItemName);
+	}
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -75,17 +91,25 @@ public void EW_OnClientItemDeath(int client, int index)
 //----------------------------------------------------------------------------------------------------
 public void EW_OnClientItemPickup(int client, int index)
 {
-/*	if (itemArray[item_display] & DISPLAY_CHAT)
+	CItem item = EW_GetItemData(index);
+
+	if (item.dConfig.bDisplayEventMessages)
 	{
-		char sName[32];
-		GetClientName(client, sName, sizeof(sName));
+		char sClientName[32];
+		GetClientName(client, sClientName, sizeof(sClientName));
 
-		char sAuth[32];
-		GetClientAuthId(client, AuthId_Steam2, sAuth, sizeof(sAuth));
+		char sClientAuth[32];
+		GetClientAuthId(client, AuthId_Steam2, sClientAuth, sizeof(sClientAuth));
 
-		CRemoveTags(sName, sizeof(sName));
-		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sName, "C9EF66", "B2B2B2", sAuth, "C9EF66", "Item Pickup", itemArray[item_color], itemArray[item_name]);
-	}*/
+		char sItemName[32];
+		item.dConfig.GetName(sItemName, sizeof(sItemName));
+
+		char sItemColor[6];
+		item.dConfig.GetColor(sItemColor, sizeof(sItemColor));
+
+		CRemoveTags(sClientName, sizeof(sClientName));
+		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sClientName, "C9EF66", "B2B2B2", sClientAuth, "C9EF66", "Item Pickup", sItemColor, sItemName);
+	}
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -93,17 +117,25 @@ public void EW_OnClientItemPickup(int client, int index)
 //----------------------------------------------------------------------------------------------------
 public void EW_OnClientItemDisconnect(int client, int index)
 {
-/*	if (itemArray[item_display] & DISPLAY_CHAT)
+	CItem item = EW_GetItemData(index);
+
+	if (item.dConfig.bDisplayEventMessages)
 	{
-		char sName[32];
-		GetClientName(client, sName, sizeof(sName));
+		char sClientName[32];
+		GetClientName(client, sClientName, sizeof(sClientName));
 
-		char sAuth[32];
-		GetClientAuthId(client, AuthId_Steam2, sAuth, sizeof(sAuth));
+		char sClientAuth[32];
+		GetClientAuthId(client, AuthId_Steam2, sClientAuth, sizeof(sClientAuth));
 
-		CRemoveTags(sName, sizeof(sName));
-		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sName, "F1B567", "B2B2B2", sAuth, "F1B567", "Item Disconnect", itemArray[item_color], itemArray[item_name]);
-	}*/
+		char sItemName[32];
+		item.dConfig.GetName(sItemName, sizeof(sItemName));
+
+		char sItemColor[6];
+		item.dConfig.GetColor(sItemColor, sizeof(sItemColor));
+
+		CRemoveTags(sClientName, sizeof(sClientName));
+		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sClientName, "F1B567", "B2B2B2", sClientAuth, "F1B567", "Item Disconnect", sItemColor, sItemName);
+	}
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -111,15 +143,23 @@ public void EW_OnClientItemDisconnect(int client, int index)
 //----------------------------------------------------------------------------------------------------
 public void EW_OnClientItemActivate(int client, int index)
 {
-/*	if (itemArray[item_display] & DISPLAY_USE)
+	CItem item = EW_GetItemData(index);
+
+	if (item.dConfig.bDisplayActivateMessages)
 	{
-		char sName[32];
-		GetClientName(client, sName, sizeof(sName));
+		char sClientName[32];
+		GetClientName(client, sClientName, sizeof(sClientName));
 
-		char sAuth[32];
-		GetClientAuthId(client, AuthId_Steam2, sAuth, sizeof(sAuth));
+		char sClientAuth[32];
+		GetClientAuthId(client, AuthId_Steam2, sClientAuth, sizeof(sClientAuth));
 
-		CRemoveTags(sName, sizeof(sName));
-		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sName, "67ADDF", "B2B2B2", sAuth, "67ADDF", "Item Activate", itemArray[item_color], itemArray[item_name]);
-	}*/
+		char sItemName[32];
+		item.dConfig.GetName(sItemName, sizeof(sItemName));
+
+		char sItemColor[6];
+		item.dConfig.GetColor(sItemColor, sizeof(sItemColor));
+
+		CRemoveTags(sClientName, sizeof(sClientName));
+		CPrintToChatAll(MESSAGEFORMAT, "E01B5D", "EDEDED", sClientName, "67ADDF", "B2B2B2", sClientAuth, "67ADDF", "Item Activate", sItemColor, sItemName);
+	}
 }
\ No newline at end of file