diff -urP BitchX/include/color.h BitchX/include/color.h
--- BitchX/include/color.h  Mon Mar  5 14:38:48 2001
+++ BitchX/include/color.h  Tue Aug 27 17:21:24 2002
@@ -24,6 +24,15 @@
 #define DEFAULT_FORMAT_475_FSET "$G $1 :Sorry, cannot join channel. %K(%WBad channel key%K)%n"
 #define DEFAULT_FORMAT_476_FSET "$G $1 :%K(%WYou are not opped%K)%n"
 
+/* Done ACTION */
+#define DEFAULT_FORMAT_ACTION_FSET "%Kð %W$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_AR_FSET "%Kð %Y$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_OTHER_FSET "%Kð %c$3%K>%W$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_OTHER_AR_FSET "%Kð %c$3%K>%Y$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_USER_FSET "%Kð %c$3%K>%W$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_USER_AR_FSET "%Kð %c$3%K>%Y$1 %n$4-"
+#define DEFAULT_FORMAT_ACTION_CHANNEL_FSET "%Kð %W$1 %n$4-"
+
 /* Done ALIAS, ASSIGN */
 #define DEFAULT_FORMAT_ALIAS_FSET "$G    %K$tolower($[10]0)%w $1-"
 #define DEFAULT_FORMAT_ASSIGN_FSET "$G    %K$tolower($[10]0)%w $1-"
@@ -67,7 +76,6 @@
 
 /* Done DCC */
 #define DEFAULT_FORMAT_DCC_CHAT_FSET "%K[%G$1%K(%gdcc%K)] %n$3-"
-#define DEFAULT_FORMAT_DCC_CHAT_AR_FSET "%K[%Y$1%K(%Ydcc%K)] %n$3-"
 #define DEFAULT_FORMAT_DCC_CONNECT_FSET "$G DCC $1 %nconnection with %W$2%K[%c$4 $5%K]%n established"
 #define DEFAULT_FORMAT_DCC_ERROR_FSET "$G %rDCC lost %w$1%w %rto $2 %K[%w$3-%K]"
 #define DEFAULT_FORMAT_DCC_LOST_FSET "$G %nDCC %W$1%n:%g$2%n %K[%C$3%K]%n $4 $5 completed in $6 secs %K(%W$7 kb/sec%K)"
@@ -109,7 +117,6 @@
 
 /* Done MSG */
 #define DEFAULT_FORMAT_MSG_FSET "%K[%P$1%K(%p$2%K)]%n $3-"
-#define DEFAULT_FORMAT_MSG_AR_FSET "%K[%Y$1%K(%Y$2%K)]%n $3-"
 
 #define DEFAULT_FORMAT_OPER_FSET "%C$1 %K[%c$2%K]%n )s now %Wan%w %GIRC%n whore"
 
@@ -120,7 +127,6 @@
 #define DEFAULT_FORMAT_IGNORE_WALL_FSET "%K%P$1%n $2-"
 /* Done MSG */
 #define DEFAULT_FORMAT_MSG_GROUP_FSET "%K-%P$1%K:%p$3%K-%n $4-"
-#define DEFAULT_FORMAT_MSG_GROUP_AR_FSET "%K-%Y$1%K:%Y$3%K-%n $4-"
 
 /* Done NAMES */
 #define DEFAULT_FORMAT_NAMES_BANNER_FSET "$G "
@@ -176,7 +182,7 @@
 #define DEFAULT_FORMAT_PUBLIC_MSG_FSET "%b(%n$1%K/%n$3%b)%n $4-"
 #define DEFAULT_FORMAT_PUBLIC_MSG_AR_FSET "%b(%Y$1%K/%Y$3%b)%n $4-"
 #define DEFAULT_FORMAT_PUBLIC_NOTICE_FSET "%K-%P$1%K:%p$3%K-%n $5-"
-#define DEFAULT_FORMAT_PUBLIC_NOTICE_AR_FSET "%K-%Y$1%K:%Y$3%K-%n $5-"
+#define DEFAULT_FORMAT_PUBLIC_NOTICE_AR_FSET "%K-%P$1%K:%p$3%K-%n $5-"
 #define DEFAULT_FORMAT_PUBLIC_OTHER_FSET "%b<%n$1%K:%n$2%b>%n $3-"
 #define DEFAULT_FORMAT_PUBLIC_OTHER_AR_FSET "%b<%Y$1%K:%Y$2%b>%n $3-"
 
@@ -191,7 +197,6 @@
 /* Not in Hades*/
 #define DEFAULT_FORMAT_SEND_AWAY_FSET "[Away ($strftime($1 %a %b %d %I:%M%p %Z))] [$tdiff2(${time() - u})] [BX-MsgLog $2]"
 #define DEFAULT_FORMAT_SEND_CTCP_FSET "%K[%rctcp%K(%R$1%K)] %n$2"
-#define DEFAULT_FORMAT_SEND_RCTCP_FSET "%K[%rrctcp%K(%R$1%K)] %n$2-"
 #define DEFAULT_FORMAT_SEND_ENCRYPTED_NOTICE_FSET "%K-%Y$1%K(%p$2%K)-%n $2-"
 #define DEFAULT_FORMAT_SEND_ENCRYPTED_MSG_FSET "%K[%Y$1%K(%p$2%K)]%n $2-"
 
@@ -267,7 +272,7 @@
 #define DEFAULT_FORMAT_VERSION_FSET "\002$0+$4$5\002 by panasync \002-\002 $2 $3"
 
 #define DEFAULT_FORMAT_WALL_FSET "%G!%g$1:$2%G!%n $3-"
-#define DEFAULT_FORMAT_WALL_AR_FSET "%G!%Y$1:$2%G!%n $3-"
+#define DEFAULT_FORMAT_WALL_AR_FSET "%G!%g$1:$2%G!%n $3-"
 
 #define DEFAULT_FORMAT_WALLOP_FSET "%K[%cWallOp%K] %n$2- ($1)"
 #define DEFAULT_FORMAT_WHO_FSET "$[7]0 %W$[9]1%w $[3]2 $3@$4 ($6-)"
@@ -420,17 +425,17 @@
 #define DEFAULT_FORMAT_ACTION_AR_FSET ansi?"%@%K* %Y$1 %n$4-":"* $1 $4-"
 #define DEFAULT_FORMAT_ACTION_CHANNEL_FSET ansi?"%@%K* %Y$1/$3 %n$4-":"* $1/$3 $4-"
 #define DEFAULT_FORMAT_ACTION_OTHER_FSET ansi?"%@%K* %n>%c$1 %n$3-":"* >$1 $3-"
-#define DEFAULT_FORMAT_ACTION_OTHER_AR_FSET ansi?"%@%K* %Y>%c$1 %n$3-":"* >$1 $3-"
+#define DEFAULT_FORMAT_ACTION_OTHER_AR_FSET ansi?"%@%K* %y>%c$1 %n$3-":"* >$1 $3-"
 #define DEFAULT_FORMAT_ACTION_USER_FSET ansi?"%@%K* %n>%c$1 %n$3-":"* >$1 $3-"
-#define DEFAULT_FORMAT_ACTION_USER_AR_FSET ansi?"%@%K* %Y>%c$1 %n$3-":"* >$1 $3-"
+#define DEFAULT_FORMAT_ACTION_USER_AR_FSET ansi?"%@%K* %y>%c$1 %n$3-":"* >$1 $3-"
 #else
 #define DEFAULT_FORMAT_ACTION_FSET ansi?"%@%Kð %W$1 %n$4-":"%@ð $1 $4-"
 #define DEFAULT_FORMAT_ACTION_AR_FSET ansi?"%@%Kð %Y$1 %n$4-":"%@ð $1 $4-"
 #define DEFAULT_FORMAT_ACTION_CHANNEL_FSET ansi?"%@%Kð %Y$1/$3 %n$4-":"%@ð $1/$3 $4-"
 #define DEFAULT_FORMAT_ACTION_OTHER_FSET ansi?"%@%K* %n>%c$1 %n$3-":"%@* >$1 $3-"
-#define DEFAULT_FORMAT_ACTION_OTHER_AR_FSET ansi?"%@%K* %Y>%c$1 %n$3-":"%@* >$1 $3-"
+#define DEFAULT_FORMAT_ACTION_OTHER_AR_FSET ansi?"%@%K* %y>%c$1 %n$3-":"%@* >$1 $3-"
 #define DEFAULT_FORMAT_ACTION_USER_FSET ansi?"%@%K* %n>%c$1 %n$3-":"%@* >$1 $3-"
-#define DEFAULT_FORMAT_ACTION_USER_AR_FSET ansi?"%@%K* %Y>%c$1 %n$3-":"%@* >$1 $3-"
+#define DEFAULT_FORMAT_ACTION_USER_AR_FSET ansi?"%@%K* %y>%c$1 %n$3-":"%@* >$1 $3-"
 #endif
 
 
@@ -472,7 +477,6 @@
 
 
 #define DEFAULT_FORMAT_DCC_CHAT_FSET ansi?"%@%K[%G$1%K(%gdcc%K)] %n$3-":"%@[$1(dcc)] $3-"
-#define DEFAULT_FORMAT_DCC_CHAT_AR_FSET ansi?"%@%K[%Y$1%K(%Ydcc%K)] %n$3-":"%@[$1(dcc)] $3-"
 #define DEFAULT_FORMAT_DCC_CONNECT_FSET "$G %RDCC%n $1 with %W$2%K[%c$4:$5%K]%n established"
 #define DEFAULT_FORMAT_DCC_ERROR_FSET "$G %RDCC%n lost %w$1%w %rto $2 %K[%w$3-%K]"
 #define DEFAULT_FORMAT_DCC_LOST_FSET "%@$G %RDCC%n %W$1%n:%g$2%n %K[%C$3%K]%n $4 $5 completed in $6 secs %K(%W$7 $8/sec%K)"
@@ -511,7 +515,6 @@
 #define DEFAULT_FORMAT_MODE_CHANNEL_FSET "$G %nmode%K/%c$3 %K[%W$4-%K]%n by %W$1"
 
 #define DEFAULT_FORMAT_MSG_FSET ansi?"%@%K[%P$1%K(%p$2%K)]%n $3-":"%@[$1($2)] $3-"
-#define DEFAULT_FORMAT_MSG_AR_FSET ansi?"%@%K[%Y$1%K(%Y$2%K)]%n $3-":"%@[$1($2)] $3-"
 
 #define DEFAULT_FORMAT_OPER_FSET "%C$1 %K[%c$2%K]%n )s now %Wan%w %GIRC%n whore"
 
@@ -521,7 +524,6 @@
 #define DEFAULT_FORMAT_IGNORE_NOTICE_FSET "%K-%P$2%K(%p$3%K)-%n $4-"
 #define DEFAULT_FORMAT_IGNORE_WALL_FSET "%K%P$1%n $2-"
 #define DEFAULT_FORMAT_MSG_GROUP_FSET "%K-%P$1%K:%p$2%K-%n $3-"
-#define DEFAULT_FORMAT_MSG_GROUP_AR_FSET "%K-%Y$1%K:%Y$2%K-%n $3-"
 
 #define DEFAULT_FORMAT_NAMES_FSET ansi?"$G %K[%GUsers%K(%g$1%K:%g$2%K)]%c $3":"$G [Users($1:$2)] $3"
 #define DEFAULT_FORMAT_NAMES_BOT_FSET ansi?"$G %K[%GBots%K(%g$1%K:%g$2%K)]%c $3":"$G [Bots($1:$2)] $3"
@@ -569,10 +571,10 @@
 #define DEFAULT_FORMAT_PUBLIC_MSG_AR_FSET ansi?"%@%b(%Y$1%K/%Y$3%b)%n $4-":"%@($1/$3) $4-"
 
 #define DEFAULT_FORMAT_PUBLIC_NOTICE_FSET ansi?"%@%K-%P$1%K:%p$3%K-%n $4-":"%@-$1:$3- $4-"
-#define DEFAULT_FORMAT_PUBLIC_NOTICE_AR_FSET ansi?"%@%K-%Y$1%K:%Y$3%K-%n $4-":"%@-$1:$3- $4-"
+#define DEFAULT_FORMAT_PUBLIC_NOTICE_AR_FSET ansi?"%@%K-%G$1%K:%g$3%K-%n $4-":"%@-$1:$3- $4-"
 
 #define DEFAULT_FORMAT_PUBLIC_OTHER_FSET ansi?"%@%b<%n$1%K:%n$2%b>%n $3-":"%@<$1:$2> $3-"
-#define DEFAULT_FORMAT_PUBLIC_OTHER_AR_FSET ansi?"%@%b<%Y$1%K:%n$2%b>%n $3-":"%@<$1:$2> $3-"
+#define DEFAULT_FORMAT_PUBLIC_OTHER_AR_FSET ansi?"%@%b<%y$1%K:%n$2%b>%n $3-":"%@<$1:$2> $3-"
 
 #ifdef ONLY_STD_CHARS
 #define DEFAULT_FORMAT_SEND_ACTION_FSET "%K* %W$1 %n$3-"
@@ -584,7 +586,6 @@
 
 #define DEFAULT_FORMAT_SEND_AWAY_FSET "[Away ($strftime($1 %a %b %d %I:%M%p %Z))] [$tdiff2(${time() - u})] [BX-MsgLog $2]"
 #define DEFAULT_FORMAT_SEND_CTCP_FSET ansi?"%K[%rctcp%K(%R$1%K)] %n$2":"[ctcp($1)] $2"
-#define DEFAULT_FORMAT_SEND_RCTCP_FSET ansi?"%K[%rrctcp%K(%R$1%K)] %n$2-":"^B[rctcp(^B$1^B)]^B $2-"
 #define DEFAULT_FORMAT_SEND_DCC_CHAT_FSET ansi?"%K[%rdcc%K(%R$1%K)] %n$2-":"[dcc($1)] $2-"
 #define DEFAULT_FORMAT_SEND_ENCRYPTED_NOTICE_FSET "%K-%Y$1%K(%p$2%K)-%n $2-"
 #define DEFAULT_FORMAT_SEND_ENCRYPTED_MSG_FSET "%K[%Y$1%K(%p$2%K)]%n $2-"
@@ -662,7 +663,7 @@
 
 
 #define DEFAULT_FORMAT_WALL_FSET "%@%G!%g$1:$2%G!%n $3-"
-#define DEFAULT_FORMAT_WALL_AR_FSET "%@%G!%Y$1:$2%G!%n $3-"
+#define DEFAULT_FORMAT_WALL_AR_FSET "%@%G!%g$1:$2%G!%n $3-"
 
 
 #define DEFAULT_FORMAT_WALLOP_FSET "%G!%g$1$2%G!%n $3-"
@@ -810,7 +811,7 @@
 #endif
 #endif
 
-#define DEFAULT_SERVER_PROMPT "[$0]"
+#define DEFAULT_SERVER_PROMPT "[$0]"
 
 #define DEFAULT_FORMAT_WATCH_SIGNOFF_FSET "$G $0!$1@$2 has signed off"
 #define DEFAULT_FORMAT_WATCH_SIGNON_FSET "$G $0!$1@$2 has signed on $3"