diff --git a/src/v_video.c b/src/v_video.c
index 0e402e62e0aa833799310fa333128f3ae52249fe..3c8b4db925cc4cb2ac14ed9b2e718bb2c0f2cd8a 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1383,38 +1383,145 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
 const char *V_ApproximateSkinColorCode(INT32 color)
 {
 	const char *cstart;
-	if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE)
-		cstart = "\x80"; // white
-	else if (color <= SKINCOLOR_BLACK || color == SKINCOLOR_JET)
-		cstart = "\x86"; // V_GRAYMAP
-	else if (color <= SKINCOLOR_LEATHER)
-		cstart = "\x8e"; // V_BROWNMAP
-	else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC)
-		cstart = "\x8d"; // V_PINKMAP
-	else if (color <= SKINCOLOR_KETCHUP)
-		cstart = "\x85"; // V_REDMAP
-	else if (color <= SKINCOLOR_TANGERINE)
-		cstart = "\x87"; // V_ORANGEMAP
-	else if (color <= SKINCOLOR_CARAMEL)
-		cstart = "\x8f"; // V_PEACHMAP
-	else if (color <= SKINCOLOR_BRONZE)
-		cstart = "\x8A"; // V_GOLDMAP
-	else if (color <= SKINCOLOR_OLIVE)
-		cstart = "\x82"; // V_YELLOWMAP
-	else if (color <= SKINCOLOR_PISTACHIO)
-		cstart = "\x8b"; // V_TEAMAP
-	else if (color <= SKINCOLOR_DREAM || color == SKINCOLOR_LIME)
-		cstart = "\x83"; // V_GREENMAP
-	else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE)
-		cstart = "\x88"; // V_SKYMAP
-	else if (color <= SKINCOLOR_STEEL)
-		cstart = "\x8c"; // V_STEELMAP
-	else if (color <= SKINCOLOR_BLUEBERRY)
-		cstart = "\x84"; // V_BLUEMAP
-	else if (color == SKINCOLOR_PURPLE)
-		cstart = "\x81"; // V_PURPLEMAP
-	else //if (color <= SKINCOLOR_POMEGRANATE)
-		cstart = "\x89"; // V_LAVENDERMAP
+	cstart = "\x83";
+
+	switch (color)
+	{
+		case SKINCOLOR_WHITE:
+		case SKINCOLOR_SILVER:
+		case SKINCOLOR_SLATE:
+			cstart = "\x80"; // White
+			break;
+		case SKINCOLOR_GREY:
+		case SKINCOLOR_NICKEL:
+		case SKINCOLOR_BLACK:
+		case SKINCOLOR_SKUNK:
+		case SKINCOLOR_JET:
+			cstart = "\x86"; // V_GRAYMAP
+			break;
+		case SKINCOLOR_SEPIA:
+		case SKINCOLOR_BEIGE:
+		case SKINCOLOR_WALNUT:
+		case SKINCOLOR_BROWN:
+		case SKINCOLOR_LEATHER:
+		case SKINCOLOR_RUST:
+		case SKINCOLOR_WRISTWATCH:
+			cstart = "\x8e"; // V_BROWNMAP
+			break;
+		case SKINCOLOR_FAIRY:
+		case SKINCOLOR_SALMON:
+		case SKINCOLOR_PINK:
+		case SKINCOLOR_ROSE:
+		case SKINCOLOR_BRICK:
+		case SKINCOLOR_LEMONADE:
+		case SKINCOLOR_BUBBLEGUM:
+		case SKINCOLOR_LILAC:
+			cstart = "\x8d"; // V_PINKMAP
+			break;
+		case SKINCOLOR_CINNAMON:
+		case SKINCOLOR_RUBY:
+		case SKINCOLOR_RASPBERRY:
+		case SKINCOLOR_CHERRY:
+		case SKINCOLOR_RED:
+		case SKINCOLOR_CRIMSON:
+		case SKINCOLOR_MAROON:
+		case SKINCOLOR_FLAME:
+		case SKINCOLOR_SCARLET:
+		case SKINCOLOR_KETCHUP:
+			cstart = "\x85"; // V_REDMAP
+			break;
+		case SKINCOLOR_DAWN:
+		case SKINCOLOR_SUNSET:
+		case SKINCOLOR_CREAMSICLE:
+		case SKINCOLOR_ORANGE:
+		case SKINCOLOR_PUMPKIN:
+		case SKINCOLOR_ROSEWOOD:
+		case SKINCOLOR_BURGUNDY:
+		case SKINCOLOR_TANGERINE:
+			cstart = "\x87"; // V_ORANGEMAP
+			break;
+		case SKINCOLOR_PEACH:
+		case SKINCOLOR_CARAMEL:
+		case SKINCOLOR_CREAM:
+			cstart = "\x8f"; // V_PEACHMAP
+			break;
+		case SKINCOLOR_GOLD:
+		case SKINCOLOR_ROYAL:
+		case SKINCOLOR_BRONZE:
+		case SKINCOLOR_COPPER:
+		case SKINCOLOR_THUNDER:
+			cstart = "\x8A"; // V_GOLDMAP
+			break;
+		case SKINCOLOR_POPCORN:
+		case SKINCOLOR_QUARRY:
+		case SKINCOLOR_YELLOW:
+		case SKINCOLOR_MUSTARD:
+		case SKINCOLOR_CROCODILE:
+		case SKINCOLOR_OLIVE:
+			cstart = "\x82"; // V_YELLOWMAP
+			break;
+		case SKINCOLOR_ARTICHOKE:
+		case SKINCOLOR_VOMIT:
+		case SKINCOLOR_GARDEN:
+		case SKINCOLOR_TEA:
+		case SKINCOLOR_PISTACHIO:
+			cstart = "\x8b"; // V_TEAMAP
+			break;
+		case SKINCOLOR_LIME:
+		case SKINCOLOR_HANDHELD:
+		case SKINCOLOR_MOSS:
+		case SKINCOLOR_CAMOUFLAGE:
+		case SKINCOLOR_ROBOHOOD:
+		case SKINCOLOR_MINT:
+		case SKINCOLOR_GREEN:
+		case SKINCOLOR_PINETREE:
+		case SKINCOLOR_EMERALD:
+		case SKINCOLOR_SWAMP:
+		case SKINCOLOR_DREAM:
+		case SKINCOLOR_PLAGUE:
+		case SKINCOLOR_ALGAE:
+			cstart = "\x83"; // V_GREENMAP
+			break;
+		case SKINCOLOR_CARIBBEAN:
+		case SKINCOLOR_AZURE:
+		case SKINCOLOR_AQUA:
+		case SKINCOLOR_TEAL:
+		case SKINCOLOR_CYAN:
+		case SKINCOLOR_JAWZ:
+		case SKINCOLOR_CERULEAN:
+		case SKINCOLOR_NAVY:
+		case SKINCOLOR_SAPPHIRE:
+			cstart = "\x88"; // V_SKYMAP
+			break;
+		case SKINCOLOR_PIGEON:
+		case SKINCOLOR_PLATINUM:
+		case SKINCOLOR_STEEL:
+			cstart = "\x8c"; // V_STEELMAP
+			break;
+		case SKINCOLOR_PERIWINKLE:
+		case SKINCOLOR_BLUE:
+		case SKINCOLOR_BLUEBERRY:
+		case SKINCOLOR_NOVA:
+			cstart = "\x84"; // V_BLUEMAP
+			break;
+		case SKINCOLOR_ULTRAVIOLET:
+		case SKINCOLOR_PURPLE:
+		case SKINCOLOR_FUCHSIA:
+			cstart = "\x81"; // V_PURPLEMAP
+			break;
+		case SKINCOLOR_PASTEL:
+		case SKINCOLOR_MOONSLAM:
+		case SKINCOLOR_DUSK:
+		case SKINCOLOR_TOXIC:
+		case SKINCOLOR_MAUVE:
+		case SKINCOLOR_LAVENDER:
+		case SKINCOLOR_BYZANTIUM:
+		case SKINCOLOR_POMEGRANATE:
+			cstart = "\x89"; // V_LAVENDERMAP
+			break;
+		default:
+			break;
+	}
 	return cstart;
 }