--- a/console.c	Sat May 14 19:25:18 2005 +0000
+++ b/console.c	Sat May 14 19:34:59 2005 +0000
@@ -73,11 +73,11 @@
 			/* If the text is longer than the window, don't show the starting ']' */
 			delta = w->width - 10 - _iconsole_cmdline.width - ICON_RIGHT_BORDERWIDTH;
 			if (delta > 0) {
-				DoDrawString("]", 5, w->height - ICON_LINE_HEIGHT, _iconsole_color_commands);
+				DoDrawString("]", 5, w->height - ICON_LINE_HEIGHT, _icolour_cmd);
 				delta = 0;
 			}
 
-			DoDrawString(_iconsole_cmdline.buf, 10 + delta, w->height - ICON_LINE_HEIGHT, _iconsole_color_commands);
+			DoDrawString(_iconsole_cmdline.buf, 10 + delta, w->height - ICON_LINE_HEIGHT, _icolour_cmd);
 
 			if (_iconsole_cmdline.caret)
 				DoDrawString("_", 10 + delta + _iconsole_cmdline.caretxoffs, w->height - ICON_LINE_HEIGHT, 12);
@@ -134,7 +134,7 @@
 					IConsoleSwitch();
 					break;
 				case WKC_RETURN: case WKC_NUM_ENTER:
-					IConsolePrintF(_iconsole_color_commands, "] %s", _iconsole_cmdline.buf);
+					IConsolePrintF(_icolour_cmd, "] %s", _iconsole_cmdline.buf);
 					IConsoleHistoryAdd(_iconsole_cmdline.buf);
 
 					IConsoleCmdExec(_iconsole_cmdline.buf);
@@ -192,11 +192,11 @@
 {
 	extern const char _openttd_revision[];
 	_iconsole_output_file = NULL;
-	_iconsole_color_default = 1;
-	_iconsole_color_error = 3;
-	_iconsole_color_warning = 13;
-	_iconsole_color_debug = 5;
-	_iconsole_color_commands = 2;
+	_icolour_def  =  1;
+	_icolour_err  =  3;
+	_icolour_warn = 13;
+	_icolour_dbg  =  5;
+	_icolour_cmd  =  2;
 	_iconsole_scroll = ICON_BUFFER;
 	_iconsole_historypos = ICON_HISTORY_SIZE - 1;
 	_iconsole_inited = true;
@@ -243,7 +243,7 @@
 bool CloseConsoleLogIfActive(void)
 {
 	if (_iconsole_output_file != NULL) {
-		IConsolePrintF(_iconsole_color_default, "file output complete");
+		IConsolePrintF(_icolour_def, "file output complete");
 		fclose(_iconsole_output_file);
 		_iconsole_output_file = NULL;
 		return true;
@@ -416,7 +416,7 @@
 void IConsoleDebug(const char* string)
 {
 	if (_stdlib_developer > 1)
-		IConsolePrintF(_iconsole_color_debug, "dbg: %s", string);
+		IConsolePrintF(_icolour_dbg, "dbg: %s", string);
 }
 
 /**
@@ -427,7 +427,7 @@
 void IConsoleWarning(const char* string)
 {
 	if (_stdlib_developer > 0)
-		IConsolePrintF(_iconsole_color_warning, "WARNING: %s", string);
+		IConsolePrintF(_icolour_warn, "WARNING: %s", string);
 }
 
 /**
@@ -436,7 +436,7 @@
  */
 void IConsoleError(const char* string)
 {
-	IConsolePrintF(_iconsole_color_error, "ERROR: %s", string);
+	IConsolePrintF(_icolour_err, "ERROR: %s", string);
 }
 
 /**
@@ -638,7 +638,7 @@
 
 				if (param < 0 || param >= tokencount) {
 					IConsoleError("too many or wrong amount of parameters passed to alias, aborting");
-					IConsolePrintF(_iconsole_color_warning, "Usage of alias '%s': %s", alias->name, alias->cmdline);
+					IConsolePrintF(_icolour_warn, "Usage of alias '%s': %s", alias->name, alias->cmdline);
 					return;
 				}
 
@@ -843,7 +843,7 @@
 	}
 
 	value = IConsoleVarGetStringValue(var);
-	IConsolePrintF(_iconsole_color_warning, "Current value for '%s' is:  %s", var->name, value);
+	IConsolePrintF(_icolour_warn, "Current value for '%s' is:  %s", var->name, value);
 }
 
 /**
@@ -853,7 +853,7 @@
 void IConsoleVarPrintSetValue(const IConsoleVar *var)
 {
 	char *value = IConsoleVarGetStringValue(var);
-	IConsolePrintF(_iconsole_color_warning, "'%s' changed to:  %s", var->name, value);
+	IConsolePrintF(_icolour_warn, "'%s' changed to:  %s", var->name, value);
 }
 
 /**
@@ -1025,13 +1025,13 @@
 	for (cmdptr = cmdstr; *cmdptr != '\0'; *cmdptr++) {
 		if (!IsValidAsciiChar(*cmdptr)) {
 			IConsoleError("command contains malformed characters, aborting");
-			IConsolePrintF(_iconsole_color_error, "ERROR: command was: '%s'", cmdstr);
+			IConsolePrintF(_icolour_err, "ERROR: command was: '%s'", cmdstr);
 			return;
 		}
 	}
 
 	if (_stdlib_con_developer)
-		IConsolePrintF(_iconsole_color_debug, "condbg: executing cmdline: '%s'", cmdstr);
+		IConsolePrintF(_icolour_dbg, "condbg: executing cmdline: '%s'", cmdstr);
 
 	memset(&tokens, 0, sizeof(tokens));
 	memset(&tokenstream, 0, sizeof(tokenstream));
@@ -1073,7 +1073,7 @@
 	if (_stdlib_con_developer) {
 		uint i;
 		for (i = 0; tokens[i] != NULL; i++)
-			IConsolePrintF(_iconsole_color_debug, "condbg: token %d is: '%s'", i, tokens[i]);
+			IConsolePrintF(_icolour_dbg, "condbg: token %d is: '%s'", i, tokens[i]);
 	}
 
 	/* 2. Determine type of command (cmd, alias or variable) and execute

--- a/console.h	Sat May 14 19:25:18 2005 +0000
+++ b/console.h	Sat May 14 19:34:59 2005 +0000
@@ -105,11 +105,11 @@
 IConsoleAlias *_iconsole_aliases; // list of registred aliases
 
 // ** console colors/modes ** //
-VARDEF byte _iconsole_color_default;
-VARDEF byte _iconsole_color_error;
-VARDEF byte _iconsole_color_warning;
-VARDEF byte _iconsole_color_debug;
-VARDEF byte _iconsole_color_commands;
+VARDEF byte _icolour_def;
+VARDEF byte _icolour_err;
+VARDEF byte _icolour_warn;
+VARDEF byte _icolour_dbg;
+VARDEF byte _icolour_cmd;
 VARDEF IConsoleModes _iconsole_mode;
 
 // ** console functions ** //

--- a/console_cmds.c	Sat May 14 19:25:18 2005 +0000
+++ b/console_cmds.c	Sat May 14 19:34:59 2005 +0000
@@ -84,7 +84,7 @@
 
 static void IConsoleHelp(const char *str)
 {
-	IConsolePrintF(_iconsole_color_warning, "- %s", str);
+	IConsolePrintF(_icolour_warn, "- %s", str);
 }
 
 DEF_CONSOLE_CMD(ConResetEngines)
@@ -154,12 +154,12 @@
 		char buf[200];
 
 		snprintf(buf, lengthof(buf), "%s%s%s.sav", _path.save_dir, PATHSEP, argv[1]);
-		IConsolePrint(_iconsole_color_default, "Saving map...");
+		IConsolePrint(_icolour_def, "Saving map...");
 
 		if (SaveOrLoad(buf, SL_SAVE) != SL_OK) {
-			IConsolePrint(_iconsole_color_error, "SaveMap failed");
+			IConsolePrint(_icolour_err, "SaveMap failed");
 		} else
-			IConsolePrintF(_iconsole_color_default, "Map sucessfully saved to %s", buf);
+			IConsolePrintF(_icolour_def, "Map sucessfully saved to %s", buf);
 		return true;
 	}
 
@@ -209,10 +209,10 @@
 				SetFiosType(item->type);
 				strcpy(_file_to_saveload.name, FiosBrowseTo(item));
 				break;
-			default: IConsolePrintF(_iconsole_color_error, "%s: Not a savegame.", file);
+			default: IConsolePrintF(_icolour_err, "%s: Not a savegame.", file);
 		}
 	} else
-		IConsolePrintF(_iconsole_color_error, "%s: No such file or directory.", file);
+		IConsolePrintF(_icolour_err, "%s: No such file or directory.", file);
 
 	FiosFreeSavegameList();
 	return true;
@@ -232,7 +232,7 @@
 
 	for (i = 0; i < _fios_num; i++) {
 		const FiosItem *item = &_fios_list[i];
-		IConsolePrintF(_iconsole_color_default, "%d) %s", i, (item->title[0] != '\0') ? item->title : item->name);
+		IConsolePrintF(_icolour_def, "%d) %s", i, (item->title[0] != '\0') ? item->title : item->name);
 	}
 
 	FiosFreeSavegameList();
@@ -259,10 +259,10 @@
 			case FIOS_TYPE_DIR: case FIOS_TYPE_DRIVE: case FIOS_TYPE_PARENT:
 				FiosBrowseTo(item);
 				break;
-			default: IConsolePrintF(_iconsole_color_error, "%s: Not a directory.", file);
+			default: IConsolePrintF(_icolour_err, "%s: Not a directory.", file);
 		}
 	} else
-		IConsolePrintF(_iconsole_color_error, "%s: No such file or directory.", file);
+		IConsolePrintF(_icolour_err, "%s: No such file or directory.", file);
 
 	FiosFreeSavegameList();
 	return true;
@@ -283,7 +283,7 @@
 	FiosFreeSavegameList();
 
 	FiosGetDescText(&path, NULL);
-	IConsolePrint(_iconsole_color_default, path);
+	IConsolePrint(_icolour_def, path);
 	return true;
 }
 
@@ -309,7 +309,7 @@
 	index = atoi(argv[1]);
 
 	if (index == NETWORK_SERVER_INDEX) {
-		IConsolePrint(_iconsole_color_default, "Silly boy, you can not ban yourself!");
+		IConsolePrint(_icolour_def, "Silly boy, you can not ban yourself!");
 		return true;
 	}
 	if (index == 0) {
@@ -353,12 +353,12 @@
 
 		if (strncmp(_network_ban_list[i], argv[1], strlen(_network_ban_list[i])) == 0) {
 			_network_ban_list[i][0] = '\0';
-			IConsolePrint(_iconsole_color_default, "IP unbanned.");
+			IConsolePrint(_icolour_def, "IP unbanned.");
 			return true;
 		}
 	}
 
-	IConsolePrint(_iconsole_color_default, "IP not in ban-list.");
+	IConsolePrint(_icolour_def, "IP not in ban-list.");
 	return true;
 }
 
@@ -371,13 +371,13 @@
 		return true;
 	}
 
-	IConsolePrint(_iconsole_color_default, "Banlist: ");
+	IConsolePrint(_icolour_def, "Banlist: ");
 
 	for (i = 0; i < lengthof(_network_ban_list); i++) {
 		if (_network_ban_list[i] == NULL || _network_ban_list[i][0] == '\0')
 			continue;
 
-		IConsolePrintF(_iconsole_color_default, "  %d) %s", i + 1, _network_ban_list[i]);
+		IConsolePrintF(_icolour_def, "  %d) %s", i + 1, _network_ban_list[i]);
 	}
 
 	return true;
@@ -392,9 +392,9 @@
 
 	if (_pause == 0) {
 		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
-		IConsolePrint(_iconsole_color_default, "Game paused.");
+		IConsolePrint(_icolour_def, "Game paused.");
 	} else
-		IConsolePrint(_iconsole_color_default, "Game is already paused.");
+		IConsolePrint(_icolour_def, "Game is already paused.");
 
 	return true;
 }
@@ -408,9 +408,9 @@
 
 	if (_pause != 0) {
 		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
-		IConsolePrint(_iconsole_color_default, "Game unpaused.");
+		IConsolePrint(_icolour_def, "Game unpaused.");
 	} else
-		IConsolePrint(_iconsole_color_default, "Game is already unpaused.");
+		IConsolePrint(_icolour_def, "Game is already unpaused.");
 
 	return true;
 }
@@ -467,7 +467,7 @@
 
 	index = atoi(argv[1]);
 	if (index == NETWORK_SERVER_INDEX) {
-		IConsolePrint(_iconsole_color_default, "Silly boy, you can not kick yourself!");
+		IConsolePrint(_icolour_def, "Silly boy, you can not kick yourself!");
 		return true;
 	}
 	if (index == 0) {
@@ -504,7 +504,7 @@
 
 	/* Check valid range */
 	if (index < 1 || index > MAX_PLAYERS) {
-		IConsolePrintF(_iconsole_color_error, "Company does not exist. Company-id must be between 1 and %d.", MAX_PLAYERS);
+		IConsolePrintF(_icolour_err, "Company does not exist. Company-id must be between 1 and %d.", MAX_PLAYERS);
 		return true;
 	}
 
@@ -537,7 +537,7 @@
 
 	/* It is safe to remove this company */
 	DoCommandP(0, 2, index, NULL, CMD_PLAYER_CTRL);
-	IConsolePrint(_iconsole_color_default, "Company deleted.");
+	IConsolePrint(_icolour_def, "Company deleted.");
 
 	return true;
 }
@@ -583,14 +583,14 @@
 
 	ParseConnectionString(&player, &port, ip);
 
-	IConsolePrintF(_iconsole_color_default, "Connecting to %s...", ip);
+	IConsolePrintF(_icolour_def, "Connecting to %s...", ip);
 	if (player != NULL) {
 		_network_playas = atoi(player);
-		IConsolePrintF(_iconsole_color_default, "    player-no: %s", player);
+		IConsolePrintF(_icolour_def, "    player-no: %s", player);
 	}
 	if (port != NULL) {
 		rport = atoi(port);
-		IConsolePrintF(_iconsole_color_default, "    port: %s", port);
+		IConsolePrintF(_icolour_def, "    port: %s", port);
 	}
 
 	NetworkClientConnectGame(ip, rport);
@@ -673,7 +673,7 @@
 	if (!CloseConsoleLogIfActive()) {
 		if (argc < 2) return false;
 
-		IConsolePrintF(_iconsole_color_default, "file output started to: %s",	argv[1]);
+		IConsolePrintF(_icolour_def, "file output started to: %s",	argv[1]);
 		_iconsole_output_file = fopen(argv[1], "ab");
 		if (_iconsole_output_file == NULL) IConsoleError("could not open file");
 	}
@@ -690,7 +690,7 @@
 	}
 
 	if (argc < 2) return false;
-	IConsolePrint(_iconsole_color_default, argv[1]);
+	IConsolePrint(_icolour_def, argv[1]);
 	return true;
 }
 
@@ -781,9 +781,9 @@
 		return true;
 	}
 
-	IConsolePrintF(_iconsole_color_default, "variable name: %s", var->name);
-	IConsolePrintF(_iconsole_color_default, "variable type: %s", _icon_vartypes[var->type]);
-	IConsolePrintF(_iconsole_color_default, "variable addr: 0x%X", var->addr);
+	IConsolePrintF(_icolour_def, "variable name: %s", var->name);
+	IConsolePrintF(_icolour_def, "variable type: %s", _icon_vartypes[var->type]);
+	IConsolePrintF(_icolour_def, "variable addr: 0x%X", var->addr);
 
 	if (var->hook.access) IConsoleWarning("variable is access hooked");
 	if (var->hook.pre) IConsoleWarning("variable is pre hooked");
@@ -809,8 +809,8 @@
 		return true;
 	}
 
-	IConsolePrintF(_iconsole_color_default, "command name: %s", cmd->name);
-	IConsolePrintF(_iconsole_color_default, "command proc: 0x%X", cmd->proc);
+	IConsolePrintF(_icolour_def, "command name: %s", cmd->name);
+	IConsolePrintF(_icolour_def, "command proc: 0x%X", cmd->proc);
 
 	if (cmd->hook.access) IConsoleWarning("command is access hooked");
 	if (cmd->hook.pre) IConsoleWarning("command is pre hooked");
@@ -863,7 +863,7 @@
 	 			cmd->proc(0, NULL);
 	 			return true;
 	 		}
-	 		IConsolePrintF(_iconsole_color_error, "ERROR: alias is of special type, please see its execution-line: '%s'", alias->cmdline);
+	 		IConsolePrintF(_icolour_err, "ERROR: alias is of special type, please see its execution-line: '%s'", alias->cmdline);
 	 		return true;
 	 	}
 
@@ -906,7 +906,7 @@
 
 	for (cmd = _iconsole_cmds; cmd != NULL; cmd = cmd->next) {
 		if (argv[1] == NULL || strncmp(cmd->name, argv[1], l) == 0) {
-				IConsolePrintF(_iconsole_color_default, "%s", cmd->name);
+				IConsolePrintF(_icolour_def, "%s", cmd->name);
 		}
 	}
 
@@ -927,7 +927,7 @@
 
 	for (var = _iconsole_vars; var != NULL; var = var->next) {
 		if (argv[1] == NULL || strncmp(var->name, argv[1], l) == 0)
-			IConsolePrintF(_iconsole_color_default, "%s", var->name);
+			IConsolePrintF(_icolour_def, "%s", var->name);
 	}
 
 	return true;
@@ -947,7 +947,7 @@
 
 	for (alias = _iconsole_aliases; alias != NULL; alias = alias->next) {
 		if (argv[1] == NULL || strncmp(alias->name, argv[1], l) == 0)
-			IConsolePrintF(_iconsole_color_default, "%s => %s", alias->name, alias->cmdline);
+			IConsolePrintF(_icolour_def, "%s => %s", alias->name, alias->cmdline);
 	}
 
 	return true;
@@ -983,7 +983,7 @@
 	if (argc != 3) return false;
 
 	if (atoi(argv[1]) < 1 || atoi(argv[1]) > MAX_PLAYERS) {
-		IConsolePrintF(_iconsole_color_default, "Unknown player. Player range is between 1 and %d.", MAX_PLAYERS);
+		IConsolePrintF(_icolour_def, "Unknown player. Player range is between 1 and %d.", MAX_PLAYERS);
 		return true;
 	}
 
@@ -1039,7 +1039,7 @@
 {
 	if (argc == 0) {
 		if (_local_player >= MAX_PLAYERS) return true; // dedicated server
-		IConsolePrintF(_iconsole_color_warning, "Current value for 'company_pw': %s", _network_player_info[_local_player].password);
+		IConsolePrintF(_icolour_warn, "Current value for 'company_pw': %s", _network_player_info[_local_player].password);
 		return true;
 	}
 
@@ -1100,7 +1100,7 @@
 DEF_CONSOLE_CMD(ConProcServerIP)
 {
 	if (argc == 0) {
-		IConsolePrintF(_iconsole_color_warning, "Current value for 'server_ip': %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
+		IConsolePrintF(_icolour_warn, "Current value for 'server_ip': %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
 		return true;
 	}
 

--- a/network_server.c	Sat May 14 19:25:18 2005 +0000
+++ b/network_server.c	Sat May 14 19:34:59 2005 +0000
@@ -787,12 +787,12 @@
 	byte flags = GetCommandFlags(cp->cmd);
 
 	if (flags & CMD_SERVER && ci->client_index != NETWORK_SERVER_INDEX) {
-		IConsolePrintF(_iconsole_color_error, "WARNING: server only command from player %d (IP: %s), kicking...", ci->client_playas, GetPlayerIP(ci));
+		IConsolePrintF(_icolour_err, "WARNING: server only command from player %d (IP: %s), kicking...", ci->client_playas, GetPlayerIP(ci));
 		return false;
 	}
 
 	if (flags & CMD_OFFLINE) {
-		IConsolePrintF(_iconsole_color_error, "WARNING: offline only command from player %d (IP: %s), kicking...", ci->client_playas, GetPlayerIP(ci));
+		IConsolePrintF(_icolour_err, "WARNING: offline only command from player %d (IP: %s), kicking...", ci->client_playas, GetPlayerIP(ci));
 		return false;
 	}
 	return true;
@@ -842,7 +842,7 @@
 
 	/* Check if cp->cmd is valid */
 	if (!IsValidCommand(cp->cmd)) {
-		IConsolePrintF(_iconsole_color_error, "WARNING: invalid command from player %d (IP: %s).", ci->client_playas, GetPlayerIP(ci));
+		IConsolePrintF(_icolour_err, "WARNING: invalid command from player %d (IP: %s).", ci->client_playas, GetPlayerIP(ci));
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
 		return;
 	}
@@ -857,8 +857,8 @@
 	 * something pretty naughty (or a bug), and will be kicked
 	 */
 	if (!(cp->cmd == CMD_PLAYER_CTRL && cp->p1 == 0) && ci->client_playas - 1 != cp->player) {
-		IConsolePrintF(_iconsole_color_error, "WARNING: player %d (IP: %s) tried to execute a command as player %d, kicking...",
-									 ci->client_playas, GetPlayerIP(ci), cp->player);
+		IConsolePrintF(_icolour_err, "WARNING: player %d (IP: %s) tried to execute a command as player %d, kicking...",
+									 ci->client_playas - 1, GetPlayerIP(ci), cp->player);
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_PLAYER_MISMATCH);
 		return;
 	}
@@ -1433,13 +1433,13 @@
 			if (_network_player_info[p->index].months_empty > _network_autoclean_unprotected && _network_player_info[p->index].password[0] == '\0') {
 				/* Shut the company down */
 				DoCommandP(0, 2, p->index, NULL, CMD_PLAYER_CTRL);
-				IConsolePrintF(_iconsole_color_default, "Auto-cleaned company #%d", p->index+1);
+				IConsolePrintF(_icolour_def, "Auto-cleaned company #%d", p->index+1);
 			}
 			/* Is the compnay empty for autoclean_protected-months, and there is a protection? */
 			if (_network_player_info[p->index].months_empty > _network_autoclean_protected && _network_player_info[p->index].password[0] != '\0') {
 				/* Unprotect the company */
 				_network_player_info[p->index].password[0] = '\0';
-				IConsolePrintF(_iconsole_color_default, "Auto-removed protection from company #%d", p->index+1);
+				IConsolePrintF(_icolour_def, "Auto-removed protection from company #%d", p->index+1);
 				_network_player_info[p->index].months_empty = 0;
 			}
 		} else {
@@ -1562,14 +1562,14 @@
 				if (lag > 3) {
 					// Client did still not report in after 4 game-day, drop him
 					//  (that is, the 3 of above, + 1 before any lag is counted)
-					IConsolePrintF(_iconsole_color_error,"Client #%d is dropped because the client did not respond for more than 4 game-days", cs->index);
+					IConsolePrintF(_icolour_err,"Client #%d is dropped because the client did not respond for more than 4 game-days", cs->index);
 					NetworkCloseClient(cs);
 					continue;
 				}
 
 				// Report once per time we detect the lag
 				if (cs->lag_test == 0) {
-					IConsolePrintF(_iconsole_color_warning,"[%d] Client #%d is slow, try increasing *net_frame_freq to a higher value!", _frame_counter, cs->index);
+					IConsolePrintF(_icolour_warn,"[%d] Client #%d is slow, try increasing *net_frame_freq to a higher value!", _frame_counter, cs->index);
 					cs->lag_test = 1;
 				}
 			} else {
@@ -1578,7 +1578,7 @@
 		} else if (cs->status == STATUS_PRE_ACTIVE) {
 			int lag = NetworkCalculateLag(cs);
 			if (lag > _network_max_join_time) {
-				IConsolePrintF(_iconsole_color_error,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->index, _network_max_join_time);
+				IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->index, _network_max_join_time);
 				NetworkCloseClient(cs);
 			}
 		}

--- a/settings_gui.c	Sat May 14 19:25:18 2005 +0000
+++ b/settings_gui.c	Sat May 14 19:34:59 2005 +0000
@@ -1072,7 +1072,7 @@
 	pe = IConsoleGetPatch(name, &page, &entry);
 
 	if (pe == NULL) {
-		IConsolePrintF(_iconsole_color_warning, "'%s' is an unknown patch setting.", name);
+		IConsolePrintF(_icolour_warn, "'%s' is an unknown patch setting.", name);
 		return;
 	}
 
@@ -1095,7 +1095,7 @@
 			tval2 = tval;
 		}
 
-		IConsolePrintF(_iconsole_color_warning, "'%s' changed to:  %s", name, tval2);
+		IConsolePrintF(_icolour_warn, "'%s' changed to:  %s", name, tval2);
 	}
 }
 
@@ -1107,7 +1107,7 @@
 
 	/* We did not find the patch setting */
 	if (pe == NULL) {
-		IConsolePrintF(_iconsole_color_warning, "'%s' is an unknown patch setting.", name);
+		IConsolePrintF(_icolour_warn, "'%s' is an unknown patch setting.", name);
 		return;
 	}
 
@@ -1116,7 +1116,7 @@
 	} else
 		snprintf(value, sizeof(value), "%d", ReadPE(pe));
 
-	IConsolePrintF(_iconsole_color_warning, "Current value for '%s' is: '%s'", name, value);
+	IConsolePrintF(_icolour_warn, "Current value for '%s' is: '%s'", name, value);
 }
 
 static const Widget _patches_selection_widgets[] = {