diff --git a/src/console.c b/src/console.c
index 3c01ec295..1defa7e82 100644
--- a/src/console.c
+++ b/src/console.c
@@ -153,11 +153,11 @@ static CV_PossibleValue_t menuhighlight_cons_t[] =
 	{V_SKYMAP, "Always sky-blue"},
 	{V_GOLDMAP, "Always gold"},
 	{V_LAVENDERMAP, "Always lavender"},
-	{V_TEAMAP, "Always tea-green"},
-	{V_STEELMAP, "Always steel-blue"},
+	{V_AQUAMAP, "Always aqua-green"},
+	{V_MAGENTAMAP, "Always magenta"},
 	{V_PINKMAP, "Always pink"},
 	{V_BROWNMAP, "Always brown"},
-	{V_PEACHMAP, "Always peach"},
+	{V_TANMAP, "Always tan"},
 	{0, NULL}
 };
 consvar_t cons_menuhighlight = {"menuhighlight", "Game type", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -303,7 +303,7 @@ static void CONS_backcolor_Change(void)
 // TODO: This could probably be improved somehow...
 // These colormaps are 99% identical, with just a few changed bytes
 UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
- *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
+ *skymap, *goldmap, *lavendermap, *aquamap, *magentamap, *pinkmap, *brownmap, *tanmap;
 
 static void CON_SetupColormaps(void)
 {
@@ -320,11 +320,11 @@ static void CON_SetupColormaps(void)
 	skymap      = (orangemap+256);
 	lavendermap = (skymap+256);
 	goldmap     = (lavendermap+256);
-	teamap      = (goldmap+256);
-	steelmap    = (teamap+256);
-	pinkmap     = (steelmap+256);
+	aquamap     = (goldmap+256);
+	magentamap  = (aquamap+256);
+	pinkmap     = (magentamap+256);
 	brownmap    = (pinkmap+256);
-	peachmap    = (brownmap+256);
+	tanmap      = (brownmap+256);
 
 	// setup the other colormaps, for console text
 
@@ -335,7 +335,7 @@ static void CON_SetupColormaps(void)
 		*memorysrc = (UINT8)(i & 0xFF); // remap each color to itself...
 
 	// SRB2Kart: Different console font, new colors
-	purplemap[0]   = (UINT8)182;
+	purplemap[0]   = (UINT8)163;
 	yellowmap[0]   = (UINT8)73;
 	greenmap[0]    = (UINT8)98;
 	bluemap[0]     = (UINT8)148;
@@ -345,11 +345,11 @@ static void CON_SetupColormaps(void)
 	skymap[0]      = (UINT8)132; // race
 	lavendermap[0] = (UINT8)192;
 	goldmap[0]     = (UINT8)65;
-	teamap[0]      = (UINT8)89;
-	steelmap[0]    = (UINT8)145;
+	aquamap[0]     = (UINT8)121;
+	magentamap[0]  = (UINT8)182;
 	pinkmap[0]     = (UINT8)210;
 	brownmap[0]    = (UINT8)224;
-	peachmap[0]    = (UINT8)217; // no longer nice :(
+	tanmap[0]      = (UINT8)217; // no longer nice :(
 
 	// Init back colormap
 	CON_SetupBackColormap();
diff --git a/src/console.h b/src/console.h
index 11621746c..7ed585177 100644
--- a/src/console.h
+++ b/src/console.h
@@ -39,7 +39,7 @@ extern UINT32 con_scalefactor; // console text scale factor
 extern consvar_t cons_backcolor, cons_menuhighlight;
 
 extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
- *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
+ *skymap, *goldmap, *lavendermap, *aquamap, *magentamap, *pinkmap, *brownmap, *tanmap;
 
 // Console bg color (auto updated to match)
 extern UINT8 *consolebgmap;
diff --git a/src/dehacked.c b/src/dehacked.c
index 5cd152982..0fb2bfb30 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8887,11 +8887,11 @@ struct {
 	{"V_SKYMAP",V_SKYMAP},
 	{"V_LAVENDERMAP",V_LAVENDERMAP},
 	{"V_GOLDMAP",V_GOLDMAP},
-	{"V_TEAMAP",V_TEAMAP},
-	{"V_STEELMAP",V_STEELMAP},
+	{"V_AQUAMAP",V_AQUAMAP},
+	{"V_MAGENTAMAP",V_MAGENTAMAP},
 	{"V_PINKMAP",V_PINKMAP},
 	{"V_BROWNMAP",V_BROWNMAP},
-	{"V_PEACHMAP",V_PEACHMAP},
+	{"V_TANMAP",V_TANMAP},
 	{"V_TRANSLUCENT",V_TRANSLUCENT},
 	{"V_10TRANS",V_10TRANS},
 	{"V_20TRANS",V_20TRANS},
diff --git a/src/v_video.c b/src/v_video.c
index 3dfea0418..4cc2ec06c 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1359,16 +1359,16 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
 		return lavendermap;
 	case 10: // 0x8A, gold
 		return goldmap;
-	case 11: // 0x8B, tea-green
-		return teamap;
-	case 12: // 0x8C, steel
-		return steelmap;
+	case 11: // 0x8B, aqua-green
+		return aquamap;
+	case 12: // 0x8C, magenta
+		return magentamap;
 	case 13: // 0x8D, pink
 		return pinkmap;
 	case 14: // 0x8E, brown
 		return brownmap;
-	case 15: // 0x8F, peach
-		return peachmap;
+	case 15: // 0x8F, tan
+		return tanmap;
 	default: // reset
 		return NULL;
 	}
diff --git a/src/v_video.h b/src/v_video.h
index c8485c179..a48fed4d3 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -79,11 +79,11 @@ extern UINT8 hudtrans;
 #define V_SKYMAP             0x00008000
 #define V_LAVENDERMAP        0x00009000
 #define V_GOLDMAP            0x0000A000
-#define V_TEAMAP             0x0000B000
-#define V_STEELMAP           0x0000C000
+#define V_AQUAMAP            0x0000B000
+#define V_MAGENTAMAP         0x0000C000
 #define V_PINKMAP            0x0000D000
 #define V_BROWNMAP           0x0000E000
-#define V_PEACHMAP           0x0000F000
+#define V_TANMAP             0x0000F000
 
 // use bits 17-20 for alpha transparency
 #define V_ALPHASHIFT         16