diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 3fc7dfc1..bb853dbf 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -114,8 +114,8 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Themes", 0 },
 
-	{ "theme_saved", "Theme saved to %_$0%_", 1, { 0 } },
-	{ "theme_save_failed", "Error saving theme to %_$0%_", 1, { 0 } },
+	{ "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 } },
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 12ce484a..2e0e7ba2 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -35,9 +35,9 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "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 } },
 	{ "query_server_changed", "Query with %_$2%_ changed to server %_$1%_", 3, { 0, 0, 0 } },
-	{ "setupserver_added", "Server $0 saved", 2, { 0, 0 } },
-	{ "setupserver_removed", "Server $0 removed", 2, { 0, 0 } },
-	{ "setupserver_not_found", "Server $0 not found", 2, { 0, 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 } },
 	{ "setupserver_header", "Server               Port  IRC Net    Settings", 0 },
 	{ "setupserver_line", "%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } },
 	{ "setupserver_footer", "", 0 },