--- xchat-events.txt	2006-08-01 00:05:39.000000000 +0100
+++ xchat-events-modified.txt	2006-08-01 00:18:09.000000000 +0100
@@ -14,7 +14,7 @@
 event_text=%C22*%O$t$1 is now known as $2
 
 event_name=Channel Action
-event_text=%C18*$t$1%O $2
+event_text=%C18* $1%O$t$2
 
 event_name=Channel Action Hilight
 event_text=%C21*%O$t%C21%B$1%O%C21 $2
@@ -47,7 +47,7 @@
 event_text=%UChannel          Users   Topic
 
 event_name=Channel Message
-event_text=%C18%H<%H$4$1%H>%H%O$t$2
+event_text=%C18%H<%H<$4$1>%H>%H%O$t$2
 
 event_name=Channel Mode Generic
 event_text=%C22*%O$t$1 sets mode $2$3 $4
@@ -56,7 +56,7 @@
 event_text=%C22*%O$t%C22Channel $1 modes: $2
 
 event_name=Channel Msg Hilight
-event_text=$4%C21%B%H<%H$1%H>%H%O%C21$t$2
+event_text=$4%C21%B%H<%H<$1>%H>%H%O%C21$t$2
 
 event_name=Channel Notice
 event_text=%C28-%C29$1/$2%C28-%O$t$3
@@ -401,7 +401,7 @@
 event_text=%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)
 
 event_name=Your Message
-event_text=%C31%H<%H$4$1%H>%H%O%C30$t$2
+event_text=%C30%H<%H<$4$1>%H>%H%O$t$2
 
 event_name=Your Nick Changing
 event_text=%C22*%O$tYou are now known as $2