diff --git a/handle.c b/handle.c
index dd42452..c1f316f 100644
--- a/handle.c
+++ b/handle.c
@@ -456,8 +456,9 @@ static void handlePrivmsg(char *prefix, char *params) {
 	bool ping = !me && isPing(mesg);
 	uiFmt(
 		tag, (hot ? UIHot : UIWarm),
-		"%c\3%d%c%s%c\17 %s",
-		ping["\17\26"], formatColor(user), me["<("], nick, me[">)"], mesg
+		"%c%c\3%d<%s>%c %s",
+		(me ? IRCUnderline : IRCColor), (ping ? IRCReverse : IRCColor),
+		formatColor(user), nick, IRCReset, mesg
 	);
 	logFmt(tag, NULL, "<%s> %s", nick, mesg);
 }
diff --git a/ui.c b/ui.c
index e437ef9..a4fedf5 100644
--- a/ui.c
+++ b/ui.c
@@ -537,7 +537,7 @@ void uiPrompt(void) {
 		);
 	} else if (!isCommand(ui.view->tag, input)) {
 		len = aswprintf(
-			&prompt, L"\3%d(%s)\3 ",
+			&prompt, L"\3%d<%s>\3 ",
 			formatColor(self.user), self.nick
 		);
 	}