diff --git a/src/k_color.c b/src/k_color.c
index 35ea3d6a8..dcf6e0fa7 100644
--- a/src/k_color.c
+++ b/src/k_color.c
@@ -53,11 +53,11 @@ UINT16 K_RainbowColor(tic_t time)
 }
 
 /*--------------------------------------------------
-	void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
+	void K_RainbowColormap(UINT8 *dest_colormap, skincolornum_t skincolor)
 
 		See header file for description.
 --------------------------------------------------*/
-void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
+void K_RainbowColormap(UINT8 *dest_colormap, skincolornum_t skincolor)
 {
 	INT32 i;
 	RGBA_t color;
@@ -193,7 +193,7 @@ static void K_IntermissionColormap(UINT8 *dest_colormap)
 			}
 		}
 
-		UINT16 skincolor = SKINCOLOR_INTERMISSION1;
+		skincolornum_t skincolor = SKINCOLOR_INTERMISSION1;
 		const double blue_start = 3.0;
 		const double blue_end = 5.0;
 		const double green_buffer = 0.5;
@@ -214,11 +214,11 @@ static void K_IntermissionColormap(UINT8 *dest_colormap)
 }
 
 /*--------------------------------------------------
-	void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
+	void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, skincolornum_t color)
 
 		See header file for description.
 --------------------------------------------------*/
-void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
+void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, skincolornum_t color)
 {
 	INT32 i;
 	INT32 starttranscolor;
diff --git a/src/k_color.h b/src/k_color.h
index 2123b22e8..3d922ce5f 100644
--- a/src/k_color.h
+++ b/src/k_color.h
@@ -55,7 +55,7 @@ UINT8 K_ColorRelativeLuminance(UINT8 r, UINT8 g, UINT8 b);
 UINT16 K_RainbowColor(tic_t time);
 
 /*--------------------------------------------------
-	void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor);
+	void K_RainbowColormap(UINT8 *dest_colormap, skincolornum_t skincolor);
 
 		Generates a colormap to "colorize" all palette indicies
 		to the provided skincolor.
@@ -68,7 +68,7 @@ UINT16 K_RainbowColor(tic_t time);
 		None
 --------------------------------------------------*/
 
-void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor);
+void K_RainbowColormap(UINT8 *dest_colormap, skincolornum_t skincolor);
 
 /*--------------------------------------------------
 	UINT8 K_HitlagColorValue(RGBA_t color);
@@ -100,7 +100,7 @@ UINT8 K_HitlagColorValue(RGBA_t color);
 void K_HitlagColormap(UINT8 *dest_colormap);
 
 /*--------------------------------------------------
-	void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color);
+	void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, skincolornum_t color);
 
 		Generates a translation colormap for Kart, to replace R_GenerateTranslationColormap in r_draw.c
 
@@ -113,7 +113,7 @@ void K_HitlagColormap(UINT8 *dest_colormap);
 		None
 --------------------------------------------------*/
 
-void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color);
+void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, skincolornum_t color);
 
 
 /*--------------------------------------------------