Updated new default.theme to module-formats files.

default.theme still contains the abstracts.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@794 dbcabf3a-b0e7-0310-adc4-f8d773084564

7 files changed, 239 insertions, 228 deletions

diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index ec555ecb..91c7c1e7 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -27,12 +27,12 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Windows", 0 },
 
-	{ "line_start", "%B-%W!%B-%n ", 0 },
-	{ "line_start_irssi", "%B-%W!%B- %WIrssi:%n ", 0 },
-	{ "timestamp", "[$[-2.0]3:$[-2.0]4] ", 6, { 1, 1, 1, 1, 1, 1 } },
+	{ "line_start", "{line_start} ", 0 },
+	{ "line_start_irssi", "{line_start} {hilight Irssi:} ", 0 },
+	{ "timestamp", "$[-2.0]3:$[-2.0]4 ", 6, { 1, 1, 1, 1, 1, 1 } },
 	{ "servertag", "[$0] ", 1, { 0 } },
 	{ "daychange", "Day changed to $[-2.0]{0} $3 $2", 4, { 1, 1, 1, 0 } },
-	{ "talking_with", "You are now talking with %_$0%_", 1, { 0 } },
+	{ "talking_with", "You are now talking with {nick $0}", 1, { 0 } },
 	{ "refnum_too_low", "Window number must be greater than 1", 0 },
 	{ "windowlist_header", "Ref Name                 Active item     Server          Level", 0 },
 	{ "windowlist_line", "$[3]0 %|$[20]1 $[15]2 $[15]3 $4", 5, { 1, 0, 0, 0, 0 } },
@@ -41,74 +41,74 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Server", 0 },
 
-	{ "looking_up", "Looking up %_$0%_", 1, { 0 } },
-	{ "connecting", "Connecting to %_$0%_ %K[%n$1%K]%n port %_$2%_", 3, { 0, 0, 1 } },
-	{ "connection_established", "Connection to %_$0%_ established", 1, { 0 } },
-	{ "cant_connect", "Unable to connect server %_$0%_ port %_$1%_ %K[%n$2%K]", 3, { 0, 1, 0 } },
-	{ "connection_lost", "Connection lost to %_$0%_", 1, { 0 } },
-	{ "lag_disconnected", "No PONG reply from server %_$0%_ in $1 seconds, disconnecting", 2, { 0, 1 } },
-	{ "disconnected", "Disconnected from %_$0%_ %K[%n$1%K]", 2, { 0, 0 } },
-	{ "server_quit", "Disconnecting from server $0: %K[%n$1%K]", 2, { 0, 0 } },
-	{ "server_changed", "Changed to %_$2%_ server %_$1%_", 3, { 0, 0, 0 } },
-	{ "unknown_server_tag", "Unknown server tag %_$0%_", 1, { 0 } },
-	{ "server_list", "%_$0%_: $1:$2 ($3)", 5, { 0, 0, 1, 0, 0 } },
-	{ "server_lookup_list", "%_$0%_: $1:$2 ($3) (connecting...)", 5, { 0, 0, 1, 0, 0 } },
-	{ "server_reconnect_list", "%_$0%_: $1:$2 ($3) ($5 left before reconnecting)", 6, { 0, 0, 1, 0, 0, 0 } },
-	{ "server_reconnect_removed", "Removed reconnection to server %_$0%_ port %_$1%_", 3, { 0, 1, 0 } },
-	{ "server_reconnect_not_found", "Reconnection tag %_$0%_ not found", 1, { 0 } },
-	{ "setupserver_added", "Server $0 saved", 2, { 0, 1 } },
-	{ "setupserver_removed", "Server $0 removed", 2, { 0, 1 } },
-	{ "setupserver_not_found", "Server $0 not found", 2, { 0, 1 } },
+	{ "looking_up", "Looking up {server $0}", 1, { 0 } },
+	{ "connecting", "Connecting to {server $0} [$1] port {hilight $2}", 3, { 0, 0, 1 } },
+	{ "connection_established", "Connection to {server $0} established", 1, { 0 } },
+	{ "cant_connect", "Unable to connect server {server $0} port {hilight $1} {reason $2}", 3, { 0, 1, 0 } },
+	{ "connection_lost", "Connection lost to {server $0}", 1, { 0 } },
+	{ "lag_disconnected", "No PONG reply from server {server $0} in $1 seconds, disconnecting", 2, { 0, 1 } },
+	{ "disconnected", "Disconnected from {server $0} {reason $1}", 2, { 0, 0 } },
+	{ "server_quit", "Disconnecting from server {server $0}: {reason $1}", 2, { 0, 0 } },
+	{ "server_changed", "Changed to {hilight $2} server {server $1}", 3, { 0, 0, 0 } },
+	{ "unknown_server_tag", "Unknown server tag {server $0}", 1, { 0 } },
+	{ "server_list", "{server $0}: $1:$2 ($3)", 5, { 0, 0, 1, 0, 0 } },
+	{ "server_lookup_list", "{server $0}: $1:$2 ($3) (connecting...)", 5, { 0, 0, 1, 0, 0 } },
+	{ "server_reconnect_list", "{server $0}: $1:$2 ($3) ($5 left before reconnecting)", 6, { 0, 0, 1, 0, 0, 0 } },
+	{ "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } },
+	{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
+	{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
+	{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } },
+	{ "setupserver_not_found", "Server {server $0} not found", 2, { 0, 1 } },
 
 	/* ---- */
 	{ NULL, "Channels", 0 },
 
-	{ "join", "%c%_$0%_ %K[%c$1%K]%n has joined %_$2", 3, { 0, 0, 0 } },
-	{ "part", "%c$0 %K[%n$1%K]%n has left %_$2%_ %K[%n$3%n%K]", 4, { 0, 0, 0, 0 } },
-	{ "kick", "%c$0%n was kicked from %_$1%_ by %_$2%_ %K[%n$3%K]", 4, { 0, 0, 0, 0 } },
-	{ "quit", "%c$0 %K[%n$1%K]%n has quit IRC %K[%n$2%n%K]", 3, { 0, 0, 0 } },
-	{ "quit_once", "%_$3%_ %c$0 %K[%n$1%K]%n has quit IRC %K[%n$2%K]", 4, { 0, 0, 0, 0 } },
-	{ "invite", "%_$0%_ invites you to %_$1", 2, { 0, 0 } },
-	{ "new_topic", "%_$0%_ changed the topic of %c$1%n to%K:%n $2", 3, { 0, 0, 0 } },
-	{ "topic_unset", "Topic unset by %_$0%_ on %c$1", 2, { 0, 0 } },
-	{ "your_nick_changed", "You're now known as %c$1", 2, { 0, 0 } },
-	{ "nick_changed", "%_$0%_ is now known as %c$1", 2, { 0, 0 } },
-	{ "talking_in", "You are now talking in %_$0%_", 1, { 0 } },
+	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 3, { 0, 0, 0 } },
+	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
+	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 4, { 0, 0, 0, 0 } },
+	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 3, { 0, 0, 0 } },
+	{ "quit_once", "{channel $3} {channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
+	{ "invite", "{nick $0} invites you to {channel $1}", 2, { 0, 0 } },
+	{ "new_topic", "{nick $0} changed the topic of {channel $1} to: $2", 3, { 0, 0, 0 } },
+	{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 2, { 0, 0 } },
+	{ "your_nick_changed", "You're now known as {nick $1}", 2, { 0, 0 } },
+	{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 2, { 0, 0 } },
+	{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
 	{ "not_in_channels", "You are not on any channels", 0 },
-	{ "current_channel", "Current channel $0", 1, { 0 } },
+	{ "current_channel", "Current channel {channel $0}", 1, { 0 } },
 	{ "chanlist_header", "You are on the following channels:", 0 },
-	{ "chanlist_line", "$[-10]0 %|+$1 ($2): $3", 4, { 0, 0, 0, 0 } },
-	{ "chansetup_not_found", "Channel $0 not found", 2, { 0, 0 } },
-	{ "chansetup_added", "Channel $0 saved", 2, { 0, 0 } },
-	{ "chansetup_removed", "Channel $0 removed", 2, { 0, 0 } },
+	{ "chanlist_line", "{channel $[-10]0} %|+$1 ($2): $3", 4, { 0, 0, 0, 0 } },
+	{ "chansetup_not_found", "Channel {channel $0} not found", 2, { 0, 0 } },
+	{ "chansetup_added", "Channel {channel $0} saved", 2, { 0, 0 } },
+	{ "chansetup_removed", "Channel {channel $0} removed", 2, { 0, 0 } },
 	{ "chansetup_header", "Channel         IRC net    Password   Settings", 0 },
-	{ "chansetup_line", "$[15]0 %|$[10]1 $[10]2 $3", 4, { 0, 0, 0, 0 } },
+	{ "chansetup_line", "{channel $[15]0} %|$[10]1 $[10]2 $3", 4, { 0, 0, 0, 0 } },
 	{ "chansetup_footer", "", 0 },
 
 	/* ---- */
 	{ NULL, "Messages", 0 },
 
-	{ "own_msg", "%K<%n$2%W$0%K>%n %|$1", 3, { 0, 0, 0 } },
-	{ "own_msg_channel", "%K<%n$3%W$0%K:%c$1%K>%n %|$2", 4, { 0, 0, 0, 0 } },
-	{ "own_msg_private", "%K[%rmsg%K(%R$0%K)]%n $1", 2, { 0, 0 } },
-	{ "own_msg_private_query", "%K<%W$2%K>%n %|$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_me", "%K<%n$2%Y$0%K>%n %|$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_me_channel", "%K<%n$3%Y$0%K:%c$1%K>%n %|$2", 4, { 0, 0, 0, 0 } },
-	{ "pubmsg_hilight", "%K<%n$3$0$1%K>%n %|$2", 4, { 0, 0, 0, 0 } },
-	{ "pubmsg_hilight_channel", "%K<%n$4$0$1%K:%c$2%K>%n %|$3", 5, { 0, 0, 0, 0, 0 } },
-	{ "pubmsg", "%K<%n$2$0%K>%n %|$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_channel", "%K<%n$3$0%K:%c$1%K>%n %|$2", 4, { 0, 0, 0, 0 } },
-	{ "msg_private", "%K[%R$0%K(%r$1%K)]%n $2", 3, { 0, 0, 0 } },
-	{ "msg_private_query", "%K<%R$0%K>%n %|$2", 3, { 0, 0, 0 } },
+	{ "own_msg", "{msgnick $2{msgownnick $0}}$1", 3, { 0, 0, 0 } },
+	{ "own_msg_channel", "{msgnick $3{msgownnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "own_msg_private", "{ownprivmsg msg{ownprivmsgdest $0}}$1", 2, { 0, 0 } },
+	{ "own_msg_private_query", "{msgnick {msgownnick $2}}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_me", "{msgnick $2{msgme $0}}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_me_channel", "{msgnick $3{msgme $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "pubmsg_hilight", "{msgnick $3$0$1}$2", 4, { 0, 0, 0, 0 } },
+	{ "pubmsg_hilight_channel", "{msgnick $4$0$1{msgchannel 2}}$3", 5, { 0, 0, 0, 0, 0 } },
+	{ "pubmsg", "{msgnick $2$0}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_channel", "{msgnick $3$0{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "msg_private", "{privmsgnick $0{privmsghost $1}}$2", 3, { 0, 0, 0 } },
+	{ "msg_private_query", "{msgnick {privmsgnick $0}}$2", 3, { 0, 0, 0 } },
 	{ "no_msgs_got", "You have not received a message from anyone yet", 0 },
 	{ "no_msgs_sent", "You have not sent a message to anyone yet", 0 },
 
 	/* ---- */
 	{ NULL, "Queries", 0 },
 
-	{ "query_start", "Starting query with %_$0%_", 1, { 0 } },
-	{ "no_query", "No query with %_$0%_", 1, { 0 } },
-	{ "query_server_changed", "Query with %_$2%_ changed to server %_$1%_", 3, { 0, 0, 0 } },
+	{ "query_start", "Starting query with {nick $0}", 1, { 0 } },
+	{ "no_query", "No query with {nick $0}", 1, { 0 } },
+	{ "query_server_changed", "Query with {nick $2} changed to server {server $1}", 3, { 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Highlighting", 0 },
@@ -132,29 +132,29 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Logging", 0 },
 
-	{ "log_opened", "Log file %_$0%_ opened", 1, { 0 } },
-	{ "log_closed", "Log file %_$0%_ closed", 1, { 0 } },
-	{ "log_create_failed", "Couldn't create log file %_$0%_: $1", 2, { 0, 0 } },
-	{ "log_locked", "Log file %_$0%_ is locked, probably by another running Irssi", 1, { 0 } },
-	{ "log_not_open", "Log file %_$0%_ not open", 1, { 0 } },
-	{ "log_started", "Started logging to file %_$0", 1, { 0 } },
-	{ "log_stopped", "Stopped logging to file %_$0", 1, { 0 } },
+	{ "log_opened", "Log file {hilight $0} opened", 1, { 0 } },
+	{ "log_closed", "Log file {hilight $0} closed", 1, { 0 } },
+	{ "log_create_failed", "Couldn't create log file {hilight $0}: $1", 2, { 0, 0 } },
+	{ "log_locked", "Log file {hilight $0} is locked, probably by another running Irssi", 1, { 0 } },
+	{ "log_not_open", "Log file {hilight $0} not open", 1, { 0 } },
+	{ "log_started", "Started logging to file {hilight $0}", 1, { 0 } },
+	{ "log_stopped", "Stopped logging to file {hilight $0}", 1, { 0 } },
 	{ "log_list_header", "Logs:", 0 },
 	{ "log_list", "$0 $1: $2 $3$4", 5, { 1, 0, 0, 0, 0, 0 } },
 	{ "log_list_footer", "", 0 },
 	{ "windowlog_file", "Window LOGFILE set to $0", 1, { 0 } },
 	{ "windowlog_file_logging", "Can't change window's logfile while log is on", 0 },
 	{ "no_away_msgs", "No new messages in awaylog", 1, { 0 } },
-	{ "away_msgs", "$1 new messages in awaylog:", 2, { 0, 1 } },
+	{ "away_msgs", "{hilight $1} new messages in awaylog:", 2, { 0, 1 } },
 
 	/* ---- */
 	{ NULL, "Modules", 0 },
 
-	{ "module_already_loaded", "Module %_$0%_ already loaded", 1, { 0 } },
-	{ "module_load_error", "Error loading module %_$0%_: $1", 2, { 0, 0 } },
-	{ "module_invalid", "%_$0%_ isn't Irssi module", 1, { 0 } },
-	{ "module_loaded", "Loaded module %_$0", 1, { 0 } },
-	{ "module_unloaded", "Unloaded module %_$0", 1, { 0 } },
+	{ "module_already_loaded", "Module {hilight $0} already loaded", 1, { 0 } },
+	{ "module_load_error", "Error loading module {hilight $0}: $1", 2, { 0, 0 } },
+	{ "module_invalid", "{hilight $0} isn't Irssi module", 1, { 0 } },
+	{ "module_loaded", "Loaded module {hilight $0}", 1, { 0 } },
+	{ "module_unloaded", "Unloaded module {hilight $0}", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Commands", 0 },
@@ -176,18 +176,18 @@ FORMAT_REC fecommon_core_formats[] = {
 
 	{ "theme_saved", "Theme saved to $0", 1, { 0 } },
 	{ "theme_save_failed", "Error saving theme to $0", 1, { 0 } },
-	{ "theme_not_found", "Theme %_$0%_ not found", 1, { 0 } },
-	{ "window_theme_changed", "Using theme %_$0%_ in this window", 1, { 0 } },
-	{ "format_title", "%:%K[%W$0%K] - [%W$1%K]%:%:", 2, { 0, 0 } },
-	{ "format_subtitle", "%K[%W$0%K]", 1, { 0 } },
-	{ "format_item", "$0 %K=%n $1", 2, { 0, 0 } },
+	{ "theme_not_found", "Theme {hilight $0} not found", 1, { 0 } },
+	{ "window_theme_changed", "Using theme {hilight $0} in this window", 1, { 0 } },
+	{ "format_title", "%:[{hilight $0}] - [{hilight $1}]%:%:", 2, { 0, 0 } },
+	{ "format_subtitle", "[{hilight $0}]", 1, { 0 } },
+	{ "format_item", "$0 = $1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Ignores", 0 },
 
-	{ "ignored", "Ignoring %_$1%_ from %_$0%_", 2, { 0, 0 } },
-	{ "unignored", "Unignored %_$0%_", 1, { 0 } },
-	{ "ignore_not_found", "%_$0%_ is not being ignored", 1, { 0 } },
+	{ "ignored", "Ignoring {hilight $1} from {nick $0}", 2, { 0, 0 } },
+	{ "unignored", "Unignored {nick $0}", 1, { 0 } },
+	{ "ignore_not_found", "{nick $0} is not being ignored", 1, { 0 } },
 	{ "ignore_no_ignores", "There are no ignores", 0 },
 	{ "ignore_header", "Ignorance List:", 0 },
 	{ "ignore_line", "$[-4]0 $1: $2 $3 $4", 4, { 1, 0, 0, 0 } },
diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c
index e95c8e23..729a8c83 100644
--- a/src/fe-common/core/printtext.c
+++ b/src/fe-common/core/printtext.c
@@ -355,12 +355,9 @@ static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
 	char *arglist[10];
 	char buffer[200]; /* should be enough? (won't overflow even if it isn't) */
 
-	const char *str;
 	char code, *ret;
 	int need_free;
 
-	str = text != NULL ? text : format->def;
-
 	/* read all optional arguments to arglist[] list
 	   so they can be used in any order.. */
 	read_arglist(va, format,
@@ -370,20 +367,20 @@ static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
 	out = g_string_new(NULL);
 
 	code = 0;
-	while (*str != '\0') {
+	while (*text != '\0') {
 		if (code == '%') {
 			/* color code */
-			if (!expand_styles(out, *str, dest)) {
+			if (!expand_styles(out, *text, dest)) {
 				g_string_append_c(out, '%');
 				g_string_append_c(out, '%');
-				g_string_append_c(out, *str);
+				g_string_append_c(out, *text);
 			}
 			code = 0;
 		} else if (code == '$') {
 			/* argument */
 			char *ret;
 
-			ret = parse_special((char **) &str, active_win->active_server,
+			ret = parse_special((char **) &text, active_win->active_server,
 					    active_win->active, arglist, &need_free, NULL);
 
 			if (ret != NULL) {
@@ -401,13 +398,13 @@ static char *output_format_text_args(TEXT_DEST_REC *dest, FORMAT_REC *format,
 			}
 			code = 0;
 		} else {
-			if (*str == '%' || *str == '$')
-				code = *str;
+			if (*text == '%' || *text == '$')
+				code = *text;
 			else
-				g_string_append_c(out, *str);
+				g_string_append_c(out, *text);
 		}
 
-		str++;
+		text++;
 	}
 
 	ret = out->str;
@@ -435,7 +432,6 @@ char *output_format_get_text(const char *module, WINDOW_REC *window,
 
 	va_start(va, formatnum);
 	ret = output_format_text_args(&dest, &formats[formatnum],
-				      module_theme == NULL ? NULL :
 				      module_theme->expanded_formats[formatnum], va);
 	va_end(va);
 
@@ -455,7 +451,6 @@ static char *output_format_text(TEXT_DEST_REC *dest, int formatnum, ...)
 
 	va_start(va, formatnum);
 	ret = output_format_text_args(dest, &fecommon_core_formats[formatnum],
-				      module_theme == NULL ? NULL :
 				      module_theme->expanded_formats[formatnum], va);
 	va_end(va);
 
@@ -480,7 +475,6 @@ void printformat_module_args(const char *module, void *server,
 	formats = g_hash_table_lookup(default_formats, module);
 
 	str = output_format_text_args(&dest, &formats[formatnum],
-				      module_theme == NULL ? NULL :
 				      module_theme->expanded_formats[formatnum], va);
 	if (*str != '\0') print_string(&dest, str);
 	g_free(str);
@@ -510,7 +504,6 @@ void printformat_module_window_args(const char *module, WINDOW_REC *window, int
 
 	formats = g_hash_table_lookup(default_formats, module);
 	str = output_format_text_args(&dest, &formats[formatnum],
-				      module_theme == NULL ? NULL :
 				      module_theme->expanded_formats[formatnum], va);
 	if (*str != '\0') print_string(&dest, str);
 	g_free(str);
diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c
index f3e573f5..c9026e46 100644
--- a/src/fe-common/core/themes.c
+++ b/src/fe-common/core/themes.c
@@ -256,8 +256,8 @@ static char *theme_format_expand_abstract(THEME_REC *theme,
 	data = g_hash_table_lookup(theme->abstracts, abstract);
 	g_free(abstract);
 	if (data == NULL) {
-		/* unknown abstract */
-		return NULL;
+		/* unknown abstract, just display the data */
+		data = "$0-";
 	}
 	abstract = g_strdup(data);
 
@@ -474,24 +474,18 @@ static void theme_set_format(THEME_REC *theme, MODULE_THEME_REC *rec,
 	}
 }
 
-static void theme_read_formats(CONFIG_REC *config, THEME_REC *theme,
-			       const char *module)
+static void theme_read_formats(THEME_REC *theme, const char *module,
+			       CONFIG_REC *config, FORMAT_REC *formats,
+			       MODULE_THEME_REC *rec)
 {
-	MODULE_THEME_REC *rec;
-	FORMAT_REC *formats;
 	CONFIG_NODE *node;
 	GSList *tmp;
 
-	formats = g_hash_table_lookup(default_formats, module);
-	if (formats == NULL) return;
-
 	node = config_node_traverse(config, "formats", FALSE);
 	if (node == NULL) return;
 	node = config_node_section(node, module, -1);
 	if (node == NULL) return;
 
-	rec = theme_module_create(theme, module);
-
 	for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
 		node = tmp->data;
 
@@ -502,26 +496,50 @@ static void theme_read_formats(CONFIG_REC *config, THEME_REC *theme,
 	}
 }
 
+static void theme_init_module(THEME_REC *theme, const char *module,
+			      CONFIG_REC *config)
+{
+	MODULE_THEME_REC *rec;
+	FORMAT_REC *formats;
+	int n;
+
+	formats = g_hash_table_lookup(default_formats, module);
+	g_return_if_fail(formats != NULL);
+
+	rec = theme_module_create(theme, module);
+
+	if (config != NULL)
+		theme_read_formats(theme, module, config, formats, rec);
+
+	/* expand the remaining formats */
+	for (n = 0; n < rec->count; n++) {
+		if (rec->expanded_formats[n] == NULL) {
+			rec->expanded_formats[n] =
+				theme_format_expand(theme, formats[n].def);
+		}
+	}
+}
+
 static void theme_read_module(THEME_REC *theme, const char *module)
 {
 	CONFIG_REC *config;
 	char *msg;
 
 	config = config_open(theme->path, -1);
-	if (config == NULL) return;
-
-	config_parse(config);
-
-	if (config_last_error(mainconfig) != NULL) {
-		msg = g_strdup_printf(_("Ignored errors in theme:\n%s"),
-				      config_last_error(mainconfig));
-		signal_emit("gui dialog", 2, "error", msg);
-		g_free(msg);
+	if (config != NULL) {
+		config_parse(config);
+
+		if (config_last_error(mainconfig) != NULL) {
+			msg = g_strdup_printf(_("Ignored errors in theme:\n%s"),
+					      config_last_error(mainconfig));
+			signal_emit("gui dialog", 2, "error", msg);
+			g_free(msg);
+		}
 	}
 
-	theme_read_formats(config, theme, module);
+	theme_init_module(theme, module, config);
 
-	config_close(config);
+	if (config != NULL) config_close(config);
 }
 
 static void themes_read_module(const char *module)
@@ -618,7 +636,7 @@ typedef struct {
 static void theme_read_modules(const char *module, void *value,
 			       THEME_READ_REC *rec)
 {
-	theme_read_formats(rec->config, rec->theme, module);
+	theme_init_module(rec->theme, module, rec->config);
 }
 
 static void theme_read(THEME_REC *theme, const char *path)
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index d9d65559..4fe22dbd 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -27,39 +27,39 @@ FORMAT_REC fecommon_irc_dcc_formats[] = {
 	/* ---- */
 	{ NULL, "DCC", 0 },
 
-	{ "own_dcc", "%K[%rdcc%K(%R$1%K)]%n %|$2", 3, { 0, 0, 0 } },
-	{ "own_dcc_action", "%W * $0%n %|$1", 2, { 0, 0 } },
-	{ "own_dcc_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
-	{ "dcc_msg", "%K[%G$0%K(%gdcc%K)]%n %|$1", 2, { 0, 0 } },
-	{ "action_dcc", "%W (*dcc*) $0%n %|$1", 2, { 0, 0 } },
-	{ "own_dcc_query", "%K<%W$0%K>%n %|$2", 3, { 0, 0, 0 } },
-	{ "dcc_msg_query", "%K<%G$0%K>%n %|$1", 2, { 0, 0 } },
-	{ "dcc_ctcp", "%g>>> DCC CTCP received from %_$0%_%K: %g$1", 2, { 0, 0 } },
-	{ "dcc_chat", "%gDCC CHAT from %_$0%_ %K[%g$1 port $2%K]", 3, { 0, 0, 1 } },
-	{ "dcc_chat_not_found", "%gNo DCC CHAT connection open to %_$0", 1, { 0 } },
-	{ "dcc_chat_connected", "%gDCC %_CHAT%_ connection with %_$0%_ %K%K[%g$1 port $2%K]%g established", 3, { 0, 0, 1 } },
-	{ "dcc_chat_disconnected", "%gDCC lost chat to %_$0", 1, { 0 } },
-	{ "dcc_send", "%gDCC SEND from %_$0%_ %K[%g$1 port $2%K]: %g$3 %K[%g$4 bytes%K]", 5, { 0, 0, 1, 0, 2 } },
-	{ "dcc_send_exists", "%gDCC already sending file %G$0%g for %_$1%_", 2, { 0, 0 } },
-	{ "dcc_send_not_found", "%gDCC not sending file %G$1%g to %_$0", 2, { 0, 0 } },
-	{ "dcc_send_file_not_found", "%gDCC file not found: %G$0%g", 1, { 0 } },
-	{ "dcc_send_connected", "%gDCC sending file %G$0%g for %_$1%_ %K[%g$2 port $3%K]", 4, { 0, 0, 0, 1 } },
-	{ "dcc_send_complete", "%gDCC sent file $0 %K[%g%_$1%_kb%K]%g for %_$2%_ in %_$3%_ secs %K[%g%_$4kb/s%_%K]", 5, { 0, 2, 0, 2, 3 } },
-	{ "dcc_send_aborted", "%gDCC aborted sending file $0 for %_$1%_", 2, { 0, 0 } },
-	{ "dcc_get_not_found", "%gDCC no file offered by %_$0", 1, { 0 } },
-	{ "dcc_get_connected", "%gDCC receiving file %G$0%g from %_$1%_ %K[%g$2 port $3%K]", 4, { 0, 0, 0, 1 } },
-	{ "dcc_get_complete", "%gDCC received file %G$0%g %K[%g$1kb%K]%g from %_$2%_ in %_$3%_ secs %K[%g$4kb/s%K]", 5, { 0, 2, 0, 2, 3 } },
-	{ "dcc_get_aborted", "%gDCC aborted receiving file $0 from %_$1%_", 2, { 0, 0 } },
-	{ "dcc_unknown_ctcp", "%gDCC unknown ctcp %G$0%g from %_$1%_ %K[%g$2%K]", 3, { 0, 0, 0 } },
-	{ "dcc_unknown_reply", "%gDCC unknown reply %G$0%g from %_$1%_ %K[%g$2%K]", 3, { 0, 0, 0 } },
-	{ "dcc_unknown_type", "%gDCC unknown type %_$0", 1, { 0 } },
-	{ "dcc_connect_error", "%gDCC can't connect to %_$0%_ port %_$1", 2, { 0, 1 } },
-	{ "dcc_cant_create", "%gDCC can't create file %G$0%g", 1, { 0 } },
-	{ "dcc_rejected", "%gDCC %G$0%g was rejected by %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } },
-	{ "dcc_close", "%gDCC %G$0%g close for %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } },
-	{ "dcc_list_header", "%gDCC connections", 0 },
-	{ "dcc_list_line_chat", "%g $0 $1", 2, { 0, 0 } },
-	{ "dcc_list_line_file", "%g $0 $1: $2k of $3k ($4%%) - $5kB/s - $6", 7, { 0, 0, 2, 2, 1, 3, 0 } },
+	{ "own_dcc", "{dccownmsg dcc{dccownnick $1}}$2", 3, { 0, 0, 0 } },
+	{ "own_dcc_action", "{dccownaction $0}$1", 2, { 0, 0 } },
+	{ "own_dcc_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } },
+	{ "dcc_msg", "{dccmsg $0{dccmsghost dcc}}$1", 2, { 0, 0 } },
+	{ "action_dcc", "{dccaction $0}$1", 2, { 0, 0 } },
+	{ "own_dcc_query", "{msgnick {msgownnick $0}}$2", 3, { 0, 0, 0 } },
+	{ "dcc_msg_query", "{msgnick {dccquerynick $0}}$1", 2, { 0, 0 } },
+	{ "dcc_ctcp", "{dcc >>> DCC CTCP received from {hilight $0}: $1}", 2, { 0, 0 } },
+	{ "dcc_chat", "{dcc DCC CHAT from {nick $0} [$1 port $2]}", 3, { 0, 0, 1 } },
+	{ "dcc_chat_not_found", "{dcc No DCC CHAT connection open to {nick $0}}", 1, { 0 } },
+	{ "dcc_chat_connected", "{dcc DCC CHAT connection with {nick $0} [$1 port $2] established}", 3, { 0, 0, 1 } },
+	{ "dcc_chat_disconnected", "{dcc DCC lost chat to {nick $0}}", 1, { 0 } },
+	{ "dcc_send", "{dcc DCC SEND from {nick $0} [$1 port $2]: $3 [$4 bytes]}", 5, { 0, 0, 1, 0, 2 } },
+	{ "dcc_send_exists", "{dcc DCC already sending file {dccfile $0} for {nick $1}}", 2, { 0, 0 } },
+	{ "dcc_send_not_found", "{dcc DCC not sending file {dccfile $1} to {nick $0}}", 2, { 0, 0 } },
+	{ "dcc_send_file_not_found", "{dcc DCC file not found: {dccfile $0}}", 1, { 0 } },
+	{ "dcc_send_connected", "{dcc DCC sending file {dccfile $0} for {nick $1} [$2 port $3]}", 4, { 0, 0, 0, 1 } },
+	{ "dcc_send_complete", "{dcc DCC sent file {dccfile $0} [{hilight $1}kb] for {nick $2} in {hilight $3} secs [{hilight $4kb/s}]}", 5, { 0, 2, 0, 2, 3 } },
+	{ "dcc_send_aborted", "{dcc DCC aborted sending file {dccfile $0} for {nick $1}}", 2, { 0, 0 } },
+	{ "dcc_get_not_found", "{dcc DCC no file offered by {nick $0}}", 1, { 0 } },
+	{ "dcc_get_connected", "{dcc DCC receiving file {dccfile $0} from {nick $1} [$2 port $3]}", 4, { 0, 0, 0, 1 } },
+	{ "dcc_get_complete", "{dcc DCC received file {dccfile $0} [$1kb] from {nick $2} in {hilight $3} secs [$4kb/s]}", 5, { 0, 2, 0, 2, 3 } },
+	{ "dcc_get_aborted", "{dcc DCC aborted receiving file {dccfile $0} from {nick $1}}", 2, { 0, 0 } },
+	{ "dcc_unknown_ctcp", "{dcc DCC unknown ctcp {hilight $0} from {nick $1} [$2]}", 3, { 0, 0, 0 } },
+	{ "dcc_unknown_reply", "{dcc DCC unknown reply {hilight $0} from {nick $1} [$2]}", 3, { 0, 0, 0 } },
+	{ "dcc_unknown_type", "{dcc DCC unknown type {hilight $0}}", 1, { 0 } },
+	{ "dcc_connect_error", "{dcc DCC can't connect to {hilight $0} port {hilight $1}}", 2, { 0, 1 } },
+	{ "dcc_cant_create", "{dcc DCC can't create file {dccfile $0}}", 1, { 0 } },
+	{ "dcc_rejected", "{dcc DCC $0 was rejected by {nick $1} [{hilight $2}]}", 3, { 0, 0, 0 } },
+	{ "dcc_close", "{dcc DCC $0 close for {nick $1} [{hilight $2}]}", 3, { 0, 0, 0 } },
+	{ "dcc_list_header", "{dcc DCC connections}", 0 },
+	{ "dcc_list_line_chat", "{dcc  $0 $1}", 2, { 0, 0 } },
+	{ "dcc_list_line_file", "{dcc  $0 $1: $2k of $3k ($4%%) - $5kB/s - $6}", 7, { 0, 0, 2, 2, 1, 3, 0 } },
 	{ "dcc_list_footer", "", 0 },
 
 	{ NULL, NULL, 0 }
diff --git a/src/fe-common/irc/flood/module-formats.c b/src/fe-common/irc/flood/module-formats.c
index e591d42c..2cca360f 100644
--- a/src/fe-common/irc/flood/module-formats.c
+++ b/src/fe-common/irc/flood/module-formats.c
@@ -28,8 +28,8 @@ FORMAT_REC fecommon_irc_flood_formats[] =
 	/* ---- */
 	{ NULL, "Autoignore", 0 },
 
-	{ "autoignore", "Flood detected from %_$0%_, autoignoring for %_$1%_ minutes", 2, { 0, 1 } },
-	{ "autounignore", "Removed autoignore from %_$0", 1, { 0 } },
+	{ "autoignore", "Flood detected from {nick $0}, autoignoring for {hilight $1} minutes", 2, { 0, 1 } },
+	{ "autounignore", "Removed autoignore from {nick $0}", 1, { 0 } },
 
 	{ NULL, NULL, 0 }
 };
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index b8e330ae..01197397 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -27,16 +27,16 @@ FORMAT_REC fecommon_irc_formats[] = {
 	/* ---- */
 	{ NULL, "Server", 0 },
 
-	{ "netsplit", "%RNetsplit%n %_$0%_ %_$1%_ quits: $2", 3, { 0, 0, 0 } },
-	{ "netsplit_more", "%RNetsplit%n %_$0%_ %_$1%_ quits: $2 (+$3 more, use /NETSPLIT to show all of them)", 4, { 0, 0, 0, 1 } },
-	{ "netsplit_join", "%CNetsplit%n over, joins: $0", 1, { 0 } },
-	{ "netsplit_join_more", "%CNetsplit%n over, joins: $0 (+$1 more)", 2, { 0, 1 } },
+	{ "netsplit", "{netsplit Netsplit} {server $0} {server $1} quits: $2", 3, { 0, 0, 0 } },
+	{ "netsplit_more", "{netsplit Netsplit} {server $0} {server $1} quits: $2 (+$3 more, use /NETSPLIT to show all of them)", 4, { 0, 0, 0, 1 } },
+	{ "netsplit_join", "{netjoin Netsplit} over, joins: $0", 1, { 0 } },
+	{ "netsplit_join_more", "{netjoin Netsplit} over, joins: $0 (+$1 more)", 2, { 0, 1 } },
 	{ "no_netsplits", "There are no net splits", 0 },
 	{ "netsplits_header", "Nick      Channel    Server               Splitted server", 0 },
-	{ "netsplits_line", "$[9]0 $[10]1 $[20]2 $3", 4, { 0, 0, 0, 0 } },
+	{ "netsplits_line", "$[9]0 {[10]1 $[20]2 $3", 4, { 0, 0, 0, 0 } },
 	{ "netsplits_footer", "", 0 },
 	{ "ircnet_added", "Ircnet $0 saved", 1, { 0 } },
-	{ "ircnet_removed", "Ircnet $0 removed", 1, { 0 } },
+	{ "ircnet_removed", "Ircnet $0} removed", 1, { 0 } },
 	{ "ircnet_not_found", "Ircnet $0 not found", 1, { 0 } },
 	{ "ircnet_header", "Ircnets:", 0 },
 	{ "ircnet_line", "$0: $1", 2, { 0, 0 } },
@@ -48,115 +48,115 @@ FORMAT_REC fecommon_irc_formats[] = {
 	/* ---- */
 	{ NULL, "Channels", 0 },
 
-	{ "joinerror_toomany", "Cannot join to channel %_$0%_ %K(%nYou have joined to too many channels%K)", 1, { 0 } },
-	{ "joinerror_full", "Cannot join to channel %_$0%_ %K(%nChannel is full%K)", 1, { 0 } },
-	{ "joinerror_invite", "Cannot join to channel %_$0%_ %K(%nYou must be invited%K)", 1, { 0 } },
-	{ "joinerror_banned", "Cannot join to channel %_$0%_ %K(%nYou are banned%K)", 1, { 0 } },
-	{ "joinerror_bad_key", "Cannot join to channel %_$0%_ %K(%nBad channel key%K)", 1, { 0 } },
-	{ "joinerror_bad_mask", "Cannot join to channel %_$0%_ %K(%nBad channel mask%K)", 1, { 0 } },
-	{ "joinerror_unavail", "Cannot join to channel %_$0%_ %K(%nChannel is temporarily unavailable%K)", 1, { 0 } },
-	{ "joinerror_duplicate", "Channel %_$0%_ already exists - cannot create it", 1, { 0 } },
-	{ "channel_rejoin", "Channel %_$0%_ is temporarily unavailable, this is normally because of netsplits. Irssi will now automatically try to rejoin back to this channel until the join is successful. Use /RMREJOINS command if you wish to abort this.", 1, { 0 } },
-	{ "inviting", "Inviting $0 to %_$1", 2, { 0, 0 } },
+	{ "joinerror_toomany", "Cannot join to channel {channel $0} (You have joined to too many channels)", 1, { 0 } },
+	{ "joinerror_full", "Cannot join to channel {channel $0} (Channel is full)", 1, { 0 } },
+	{ "joinerror_invite", "Cannot join to channel {channel $0} (You must be invited)", 1, { 0 } },
+	{ "joinerror_banned", "Cannot join to channel {channel $0} (You are banned)", 1, { 0 } },
+	{ "joinerror_bad_key", "Cannot join to channel {channel $0} (Bad channel key)", 1, { 0 } },
+	{ "joinerror_bad_mask", "Cannot join to channel {channel $0} (Bad channel mask)", 1, { 0 } },
+	{ "joinerror_unavail", "Cannot join to channel {channel $0} (Channel is temporarily unavailable)", 1, { 0 } },
+	{ "joinerror_duplicate", "Channel {channel $0} already exists - cannot create it", 1, { 0 } },
+	{ "channel_rejoin", "Channel {channel $0} is temporarily unavailable, this is normally because of netsplits. Irssi will now automatically try to rejoin back to this channel until the join is successful. Use /RMREJOINS command if you wish to abort this.", 1, { 0 } },
+	{ "inviting", "Inviting {nick $0} to {channel $1}", 2, { 0, 0 } },
 	{ "not_invited", "You have not been invited to a channel!", 0 },
-	{ "names", "%K[%g%_Users%_%K(%g$0%K)]%n $1", 2, { 0, 0 } },
-	{ "names_nick", "%K[%n%_$0%_$1%K] ", 2, { 0, 0 } },
-	{ "endofnames", "%g%_$0%_%K:%n Total of %_$1%_ nicks %K[%n%_$2%_ ops, %_$3%_ voices, %_$4%_ normal%K]", 5, { 0, 1, 1, 1, 1 } },
-	{ "channel_created", "Channel %_$0%_ created $1", 2, { 0, 0 } },
-	{ "url", "Home page for %c$0%K:%n $1", 2, { 0, 0 } },
-	{ "topic", "Topic for %c$0%K:%n $1", 2, { 0, 0 } },
-	{ "no_topic", "No topic set for %c$0", 1, { 0 } },
-	{ "topic_info", "Topic set by %_$0%_ %K[%n$1%K]", 2, { 0, 0 } },
-	{ "chanmode_change", "mode/%c$0 %K[%n$1%K]%n by %_$2", 3, { 0, 0, 0 } },
-	{ "server_chanmode_change", "%RServerMode/%c$0 %K[%n$1%K]%n by %_$2", 3, { 0, 0, 0 } },
-	{ "channel_mode", "mode/%c$0 %K[%n$1%K]", 2, { 0, 0 } },
-	{ "bantype", "Ban type changed to %_$0", 1, { 0 } },
-	{ "no_bans", "No bans in channel %_$0%_", 1, { 0 } },
-	{ "banlist", "%_$0%_: ban %c$1", 2, { 0, 0 } },
-	{ "banlist_long", "%_$0%_: ban %c$1 %K[%nby %_$2%_, $3 secs ago%K]", 4, { 0, 0, 0, 1 } },
-	{ "ebanlist", "%_$0%_: ban exception %c$1", 2, { 0, 0 } },
-	{ "ebanlist_long", "%_$0%_: ban exception %c$1 %K[%nby %_$2%_, $3 secs ago%K]", 4, { 0, 0, 0, 1 } },
-	{ "invitelist", "%_$0%_: invite %c$1", 2, { 0, 0 } },
-	{ "no_such_channel", "$0: No such channel", 1, { 0 } },
-	{ "channel_synced", "Join to %_$0%_ was synced in %_$1%_ secs", 2, { 0, 2 } },
+	{ "names", "{names_users Users {names_channel $0}}$1", 2, { 0, 0 } },
+	{ "names_nick", "[{names_nickstat $0}$1] ", 2, { 0, 0 } },
+	{ "endofnames", "{channel $0}: Total of {hilight $1} nicks [{hilight $2} ops, {hilight $3} voices, {hilight $4} normal]", 5, { 0, 1, 1, 1, 1 } },
+	{ "channel_created", "Channel {channelhilight $0} created $1", 2, { 0, 0 } },
+	{ "url", "Home page for {channelhilight $0}: $1", 2, { 0, 0 } },
+	{ "topic", "Topic for {channelhilight $0}: $1", 2, { 0, 0 } },
+	{ "no_topic", "No topic set for {channelhilight $0}", 1, { 0 } },
+	{ "topic_info", "Topic set by {nick $0} [$1]", 2, { 0, 0 } },
+	{ "chanmode_change", "mode/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
+	{ "server_chanmode_change", "{netsplit ServerMode}/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
+	{ "channel_mode", "mode/{channelhilight $0} [$1]", 2, { 0, 0 } },
+	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
+	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
+	{ "banlist", "{channel $0}: ban {ban $1}", 2, { 0, 0 } },
+	{ "banlist_long", "{channel $0}: ban {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
+	{ "ebanlist_long", "{channel $0}: ban exception {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
+	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
+	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
 
 	/* ---- */
 	{ NULL, "Nick", 0 },
 
-	{ "usermode_change", "Mode change %K[%n%_$0%_%K]%n for user %c$1", 2, { 0, 0 } },
-	{ "user_mode", "Your user mode is %K[%n%_$0%_%K]", 1, { 0 } },
+	{ "usermode_change", "Mode change [{hilight $0}] for user {nick $1}", 2, { 0, 0 } },
+	{ "user_mode", "Your user mode is [{hilight $0}]", 1, { 0 } },
 	{ "away", "You have been marked as being away", 0 },
 	{ "unaway", "You are no longer marked as being away", 0 },
-	{ "nick_away", "$0 is away: $1", 2, { 0, 0 } },
-	{ "no_such_nick", "$0: No such nick/channel", 1, { 0 } },
-	{ "your_nick", "Your nickname is $0", 1, { 0 } },
-	{ "nick_in_use", "Nick %_$0%_ is already in use", 1, { 0 } },
-	{ "nick_unavailable", "Nick %_$0%_ is temporarily unavailable", 1, { 0 } },
-	{ "your_nick_owned", "Your nick is owned by %_$3%_ %K[%n$1@$2%K]", 4, { 0, 0, 0, 0 } },
+	{ "nick_away", "{nick $0} is away: $1", 2, { 0, 0 } },
+	{ "no_such_nick", "{nick $0}: No such nick/channel", 1, { 0 } },
+	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
+	{ "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
+	{ "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
+	{ "your_nick_owned", "Your nick is owned by {nick $3} [$1@$2]", 4, { 0, 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Who queries", 0 },
 
-	{ "whois", "%_$0%_ %K[%n$1@$2%K]%n%: ircname  : $3", 4, { 0, 0, 0, 0 } },
-	{ "whowas", "%_$0%_ %K[%n$1@$2%K]%n%: ircname  : $3", 4, { 0, 0, 0, 0 } },
+	{ "whois", "{nick $0} [$1@$2]%: ircname  : $3", 4, { 0, 0, 0, 0 } },
+	{ "whowas", "{nick $0} [$1@$2]%: ircname  : $3", 4, { 0, 0, 0, 0 } },
 	{ "whois_idle", " idle     : $1 days $2 hours $3 mins $4 secs", 5, { 0, 1, 1, 1, 1 } },
-	{ "whois_idle_signon", " idle     : $1 days $2 hours $3 mins $4 secs %K[%nsignon: $5%K]", 6, { 0, 1, 1, 1, 1, 0 } },
-	{ "whois_server", " server   : $1 %K[%n$2%K]", 3, { 0, 0, 0 } },
-	{ "whois_oper", "          : %_IRC operator%_", 1, { 0 } },
+	{ "whois_idle_signon", " idle     : $1 days $2 hours $3 mins $4 secs [signon: $5]", 6, { 0, 1, 1, 1, 1, 0 } },
+	{ "whois_server", " server   : $1 [$2]", 3, { 0, 0, 0 } },
+	{ "whois_oper", "          : {hilight IRC operator}", 1, { 0 } },
 	{ "whois_registered", "          : has registered this nick", 1, { 0 } },
 	{ "whois_channels", " channels : $1", 2, { 0, 0 } },
 	{ "whois_away", " away     : $1", 2, { 0, 0 } },
 	{ "end_of_whois", "End of WHOIS", 1, { 0 } },
 	{ "end_of_whowas", "End of WHOWAS", 1, { 0 } },
 	{ "whois_not_found", "There is no such nick $0", 1, { 0 } },
-	{ "who", "$[-10]0 %|%_$[!9]1%_ $[!3]2 $[!2]3 $4@$5 %K(%W$6%K)", 7, { 0, 0, 0, 0, 0, 0, 0 } },
+	{ "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 [{hilight $6}]", 7, { 0, 0, 0, 0, 0, 0, 0 } },
 	{ "end_of_who", "End of /WHO list", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Your messages", 0 },
 
-	{ "own_notice", "%K[%rnotice%K(%R$0%K)]%n $1", 2, { 0, 0 } },
-	{ "own_action", "%W * $0%n $1", 2, { 0, 0 } },
-	{ "own_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
-	{ "own_wall", "%K[%WWall%K/%c$0%K]%n $1", 2, { 0, 0 } },
+	{ "own_notice", "{ownnotice notice{ownnotice_target $0}}$1", 2, { 0, 0 } },
+	{ "own_action", "{ownaction $0}$1", 2, { 0, 0 } },
+	{ "own_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } },
+	{ "own_wall", "{ownwall Wall{ownwall_channel}}$1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Received messages", 0 },
 
-	{ "notice_server", "%g!$0%n $1", 2, { 0, 0 } },
-	{ "notice_public", "%K-%M$0%K:%m$1%K-%n $2", 3, { 0, 0, 0 } },
-	{ "notice_public_ops", "%K-%M$0%K:%m@$1%K-%n $2", 3, { 0, 0, 0 } },
-	{ "notice_private", "%K-%M$0%K(%m$1%K)-%n $2", 3, { 0, 0, 0 } },
-	{ "action_private", "%W (*) $0%n $2", 3, { 0, 0, 0 } },
-	{ "action_private_query", "%W * $0%n $2", 3, { 0, 0, 0 } },
-	{ "action_public", "%W * $0%n $1", 2, { 0, 0 } },
-	{ "action_public_channel", "%W * $0%K:%c$1%n $2", 3, { 0, 0, 0 } },
+	{ "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
+	{ "notice_public", "{notice $0{pubnotice_channel $1}$2", 3, { 0, 0, 0 } },
+	{ "notice_public_ops", "{notice $0{pubnotice_channel @$1}$2", 3, { 0, 0, 0 } },
+	{ "notice_private", "{notice $0{pvtnotice_nick $1}}$2", 3, { 0, 0, 0 } },
+	{ "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
+	{ "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
+	{ "action_public", "{pubaction $0}$1", 2, { 0, 0 } },
+	{ "action_public_channel", "{pubaction $0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "CTCPs", 0 },
 
-	{ "ctcp_reply", "CTCP %_$0%_ reply from %_$1%_%K:%n $2", 3, { 0, 0, 0 } },
-	{ "ctcp_reply_channel", "CTCP %_$0%_ reply from %_$1%_ in channel %_$3%_%K:%n $2", 4, { 0, 0, 0, 0 } },
-	{ "ctcp_ping_reply", "CTCP %_PING%_ reply from %_$0%_: $1.$[-3.0]2 seconds", 3, { 0, 2, 2 } },
-	{ "ctcp_requested", "%g>>> %_$0%_ %K[%g$1%K] %grequested %_$2%_ from %_$3", 4, { 0, 0, 0, 0 } },
+	{ "ctcp_reply", "CTCP {hilight $0} reply from {nick $1}: $2", 3, { 0, 0, 0 } },
+	{ "ctcp_reply_channel", "CTCP {hilight $0} reply from {nick $1} in channel {channel $3}: $2", 4, { 0, 0, 0, 0 } },
+	{ "ctcp_ping_reply", "CTCP {hilight PING} reply from {nick $0}: $1.$[-3.0]2 seconds", 3, { 0, 2, 2 } },
+	{ "ctcp_requested", "{ctcp >>> {hilight $0} [$1] requested {hilight $2} from {nick $3}}", 4, { 0, 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Other server events", 0 },
 
-	{ "online", "Users online: %_$0", 1, { 0 } },
+	{ "online", "Users online: {hilight $0}", 1, { 0 } },
 	{ "pong", "PONG received from $0: $1", 2, { 0, 0 } },
-	{ "wallops", "%WWALLOP%n $0: $1", 2, { 0, 0 } },
-	{ "action_wallops", "%WWALLOP * $0%n $1", 2, { 0, 0 } },
-	{ "error", "%_ERROR%_ $0", 1, { 0 } },
+	{ "wallops", "{wallop WALLOP{wallop_nick $0}$1", 2, { 0, 0 } },
+	{ "action_wallops", "{wallop WALLOP{wallop_action $0}}$1", 2, { 0, 0 } },
+	{ "error", "{hilight ERROR} $0", 1, { 0 } },
 	{ "unknown_mode", "Unknown mode character $0", 1, { 0 } },
-	{ "not_chanop", "You're not channel operator in $0", 1, { 0 } },
+	{ "not_chanop", "You're not channel operator in {channel $0}", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Misc", 0 },
 
-	{ "silenced", "Silenced %_$0%_", 1, { 0 } },
-	{ "unsilenced", "Unsilenced %_$0%_", 1, { 0 } },
-	{ "silence_line", "%_$0%_: silence %c$1", 2, { 0, 0 } },
+	{ "silenced", "Silenced {nick $0}", 1, { 0 } },
+	{ "unsilenced", "Unsilenced {nick $0}", 1, { 0 } },
+	{ "silence_line", "{nick $0}: silence {ban $1}", 2, { 0, 0 } },
 
 	{ NULL, NULL, 0 }
 };
diff --git a/src/fe-common/irc/notifylist/module-formats.c b/src/fe-common/irc/notifylist/module-formats.c
index e369d52c..345dfe24 100644
--- a/src/fe-common/irc/notifylist/module-formats.c
+++ b/src/fe-common/irc/notifylist/module-formats.c
@@ -28,12 +28,12 @@ FORMAT_REC fecommon_irc_notifylist_formats[] =
 	/* ---- */
 	{ NULL, "Notifylist", 0 },
 
-	{ "notify_join", "%_$0%_ %K[%n$1@$2%K] [%n%_$3%_%K]%n has joined to $4", 5, { 0, 0, 0, 0, 0 } },
-	{ "notify_part", "%_$0%_ has left $4", 5, { 0, 0, 0, 0, 0 } },
-	{ "notify_away", "%_$0%_ %K[%n$5%K]%n %K[%n$1@$2%K] [%n%_$3%_%K]%n is now away: $4", 6, { 0, 0, 0, 0, 0, 0 } },
-	{ "notify_unaway", "%_$0%_ %K[%n$4%K]%n %K[%n$1@$2%K] [%n%_$3%_%K]%n is now unaway", 5, { 0, 0, 0, 0, 0 } },
-	{ "notify_unidle", "%_$0%_ %K[%n$5%K]%n %K[%n$1@$2%K] [%n%_$3%_%K]%n just stopped idling", 6, { 0, 0, 0, 0, 0, 0 } },
-	{ "notify_online", "On $0: %_$1%_", 2, { 0, 0 } },
+	{ "notify_join", "{nick $0} [$1@$2] [{hilight $3}] has joined to $4", 5, { 0, 0, 0, 0, 0 } },
+	{ "notify_part", "{nick $0} has left $4", 5, { 0, 0, 0, 0, 0 } },
+	{ "notify_away", "{nick $0} [$5] [$1@$2] [{hilight $3}] is now away: $4", 6, { 0, 0, 0, 0, 0, 0 } },
+	{ "notify_unaway", "{nick $0} [$4] [$1@$2] [{hilight $3}] is now unaway", 5, { 0, 0, 0, 0, 0 } },
+	{ "notify_unidle", "{nick $0} [$5] [$1@$2] [{hilight $3}] just stopped idling", 6, { 0, 0, 0, 0, 0, 0 } },
+	{ "notify_online", "On $0: {hilight $1}", 2, { 0, 0 } },
 	{ "notify_offline", "Offline: $0", 1, { 0 } },
 	{ "notify_list", "$0: $1 $2 $3", 4, { 0, 0, 0, 0 } },