From 0d357adb5206279146416663c97d80af2d944c77 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 00:03:31 +0100
Subject: [PATCH 01/15] Base colour changes Default colours before new colours
 are potentially added. Rosewood is the same as orange and will likely be
 removed.

---
 src/r_draw.c | 191 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 134 insertions(+), 57 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index cd219c15f..a8f48bbeb 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -236,27 +236,27 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x03, // SKINCOLOR_SILVER
 		0x08, // SKINCOLOR_GREY
 		0x18, // SKINCOLOR_BLACK
-		0xd0, // SKINCOLOR_CYAN
-		0xdc, // SKINCOLOR_TEAL
-		0xc8, // SKINCOLOR_STEELBLUE
-		0xe2, // SKINCOLOR_BLUE
-		0x40, // SKINCOLOR_PEACH
-		0x48, // SKINCOLOR_TAN
-		0x90, // SKINCOLOR_PINK
-		0xf8, // SKINCOLOR_LAVENDER
-		0xc0, // SKINCOLOR_PURPLE
-		0x52, // SKINCOLOR_ORANGE
-		0x5c, // SKINCOLOR_ROSEWOOD
-		0x20, // SKINCOLOR_BEIGE
-		0x30, // SKINCOLOR_BROWN
-		0x7d, // SKINCOLOR_RED
-		0x85, // SKINCOLOR_DARKRED
-		0xb8, // SKINCOLOR_NEONGREEN
-		0xa0, // SKINCOLOR_GREEN
-		0xb0, // SKINCOLOR_ZIM
-		0x69, // SKINCOLOR_OLIVE
-		0x67, // SKINCOLOR_YELLOW
-		0x70, // SKINCOLOR_GOLD
+		0x70, // SKINCOLOR_CYAN
+		0x7c, // SKINCOLOR_TEAL
+		0x9a, // SKINCOLOR_STEELBLUE
+		0x80, // SKINCOLOR_BLUE
+		0xc8, // SKINCOLOR_PEACH
+		0x54, // SKINCOLOR_TAN
+		0xc0, // SKINCOLOR_PINK
+		0xb0, // SKINCOLOR_LAVENDER
+		0xa0, // SKINCOLOR_PURPLE
+		0x30, // SKINCOLOR_ORANGE
+		0x30, // SKINCOLOR_ROSEWOOD
+		0xe0, // SKINCOLOR_BEIGE
+		0xd0, // SKINCOLOR_BROWN
+		0x20, // SKINCOLOR_RED
+		0x28, // SKINCOLOR_DARKRED
+		0xf0, // SKINCOLOR_NEONGREEN
+		0x60, // SKINCOLOR_GREEN
+		0x58, // SKINCOLOR_ZIM
+		0x49, // SKINCOLOR_OLIVE
+		0x48, // SKINCOLOR_YELLOW
+		0x40, // SKINCOLOR_GOLD
 	};
 	INT32 i;
 	INT32 starttranscolor;
@@ -293,25 +293,18 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 	{
 	case SKINCOLOR_SILVER:
 	case SKINCOLOR_GREY:
-	case SKINCOLOR_PEACH:
-	case SKINCOLOR_BEIGE:
 	case SKINCOLOR_BROWN:
 	case SKINCOLOR_RED:
 	case SKINCOLOR_GREEN:
 	case SKINCOLOR_BLUE:
+
+	case SKINCOLOR_ORANGE:
+	case SKINCOLOR_ROSEWOOD:
 		// 16 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		break;
 
-	case SKINCOLOR_ORANGE:
-		// 14 colors of orange + brown
-		for (i = 0; i < SKIN_RAMP_LENGTH-2; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
-		for (i = 0; i < 2; i++)
-			dest_colormap[starttranscolor + (i+SKIN_RAMP_LENGTH-2)] = (UINT8)(152 + i);
-		break;
-
 	case SKINCOLOR_CYAN:
 		// 12 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
@@ -320,57 +313,141 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 
 	case SKINCOLOR_WHITE:
 	case SKINCOLOR_BLACK:
-	case SKINCOLOR_STEELBLUE:
 	case SKINCOLOR_PINK:
-	case SKINCOLOR_LAVENDER:
-	case SKINCOLOR_PURPLE:
 	case SKINCOLOR_DARKRED:
 	case SKINCOLOR_ZIM:
-	case SKINCOLOR_YELLOW:
-	case SKINCOLOR_GOLD:
 		// 8 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
 	case SKINCOLOR_TEAL:
-		// 5 color ramp
+		// 5 color ramp, from 2 colour ranges
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (5*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xf7;
+				dest_colormap[starttranscolor + i] = 0xf8;
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (5*i/SKIN_RAMP_LENGTH) - 1);
 		}
 		break;
 
+	case SKINCOLOR_PEACH:
+		// 10 color rame, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0xC0; // Lightest
+			else if (10*i/16 == 1)
+				dest_colormap[starttranscolor + i] = 0x30; // Second
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
+	case SKINCOLOR_TAN:
+		// 8 color rame, from 3 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (8*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x51; // Lightest 1
+			else if (8*i/16 == 5)
+				dest_colormap[starttranscolor + i] = 0xE5; // Darkest 1
+			else if (8*i/16 == 6)
+				dest_colormap[starttranscolor + i] = 0xE9; // Darkest 2
+			else if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0xDD; // Darkest 3
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
+		break;
+
+	case SKINCOLOR_BEIGE:
+		// 13 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (13*i/16 == 12)
+				dest_colormap[starttranscolor + i] = 0xDD; // darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
+		}
+		break;
+
+	case SKINCOLOR_STEELBLUE:
+		// 8 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (8*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0x80 + 8*i/16; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
+	case SKINCOLOR_LAVENDER:
+		// 10 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0xEC + 10*i/16; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
+	case SKINCOLOR_PURPLE:
+		// 12 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (12*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0xEC; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
+		break;
+
+	case SKINCOLOR_YELLOW:
+		// 13 color range, from 2 color ranges
+		// actually magenta
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (12*i/16 <= 3)
+				dest_colormap[starttranscolor + i] = 0x50 + 12*i/16; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH) - 4); // main
+		}
+		break;
+
+	case SKINCOLOR_GOLD:
+		// 10 color rame, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x50; // Lightest
+			else if (10*i/16 == 1)
+				dest_colormap[starttranscolor + i] = 0x53; // Second
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
 	case SKINCOLOR_OLIVE:
 		// 7 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
 		break;
 
-	case SKINCOLOR_TAN:
-		// 16 color ramp, from two color ranges
-		for (i = 0; i < SKIN_RAMP_LENGTH/2; i++) // Peach half
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
-		for (i = 0; i < SKIN_RAMP_LENGTH/2; i++) // Brown half
-			dest_colormap[starttranscolor + (i+8)] = (UINT8)(48 + i);
-		break;
-
-	case SKINCOLOR_ROSEWOOD:
-		// 12 color ramp, from two color ranges!
-		for (i = 0; i < 6; i++) // Orange ...third?
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH));
-		for (i = 0; i < 10; i++) // Rosewood two-thirds-ish
-			dest_colormap[starttranscolor + (i+6)] = (UINT8)(152 + (12*i/SKIN_RAMP_LENGTH));
-		break;
-
 	case SKINCOLOR_NEONGREEN:
 		// Multi-color ramp
-		dest_colormap[starttranscolor] = 0xA0; // Brighter green
-		for (i = 0; i < SKIN_RAMP_LENGTH-1; i++) // Neon Green
-			dest_colormap[starttranscolor + (i+1)] = (UINT8)(skinbasecolors[color - 1] + (6*i/(SKIN_RAMP_LENGTH-1)));
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0x60 + 10*i/16; // Brighter green
+			else if (10*i/16 < 9)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // Neon green
+			else
+				dest_colormap[starttranscolor + i] = 0x6F;
+		}
 		break;
 
 	// Super colors, from lightest to darkest!

From 70d0595817ddd20c8519911cdc7e5bea72a87c90 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 17:58:52 +0100
Subject: [PATCH 02/15] Update colour changes More correct colour ranges. Added
 Rosewood. Added Super Sonic Colours (No Super Tails or Knuckles, at least not
 yet).

---
 src/r_draw.c | 278 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 174 insertions(+), 104 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index a8f48bbeb..6689e6c29 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -239,17 +239,17 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x70, // SKINCOLOR_CYAN
 		0x7c, // SKINCOLOR_TEAL
 		0x9a, // SKINCOLOR_STEELBLUE
-		0x80, // SKINCOLOR_BLUE
+		0x82, // SKINCOLOR_BLUE
 		0xc8, // SKINCOLOR_PEACH
 		0x54, // SKINCOLOR_TAN
 		0xc0, // SKINCOLOR_PINK
 		0xb0, // SKINCOLOR_LAVENDER
-		0xa0, // SKINCOLOR_PURPLE
-		0x30, // SKINCOLOR_ORANGE
-		0x30, // SKINCOLOR_ROSEWOOD
+		0xa3, // SKINCOLOR_PURPLE
+		0x31, // SKINCOLOR_ORANGE
+		0x3a, // SKINCOLOR_ROSEWOOD
 		0xe0, // SKINCOLOR_BEIGE
 		0xd0, // SKINCOLOR_BROWN
-		0x20, // SKINCOLOR_RED
+		0x21, // SKINCOLOR_RED
 		0x28, // SKINCOLOR_DARKRED
 		0xf0, // SKINCOLOR_NEONGREEN
 		0x60, // SKINCOLOR_GREEN
@@ -294,12 +294,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 	case SKINCOLOR_SILVER:
 	case SKINCOLOR_GREY:
 	case SKINCOLOR_BROWN:
-	case SKINCOLOR_RED:
 	case SKINCOLOR_GREEN:
-	case SKINCOLOR_BLUE:
-
-	case SKINCOLOR_ORANGE:
-	case SKINCOLOR_ROSEWOOD:
 		// 16 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
@@ -311,24 +306,43 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH));
 		break;
 
+	case SKINCOLOR_PURPLE:
+		// 9 color ramp
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
+		break;
+
 	case SKINCOLOR_WHITE:
 	case SKINCOLOR_BLACK:
 	case SKINCOLOR_PINK:
-	case SKINCOLOR_DARKRED:
 	case SKINCOLOR_ZIM:
 		// 8 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
-	case SKINCOLOR_TEAL:
-		// 5 color ramp, from 2 colour ranges
+	case SKINCOLOR_RED:
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (5*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xf8;
+			if (i == 13)
+				dest_colormap[starttranscolor + i] = 0x47;
+			else if (i > 13)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 1);
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (5*i/SKIN_RAMP_LENGTH) - 1);
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
+		}
+		break;
+
+	case SKINCOLOR_DARKRED:
+		// 9 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (9*i/16 == 6)
+				dest_colormap[starttranscolor + i] = 0x47;
+			else if (9*i/16 > 6)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH) - 1);
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
 		}
 		break;
 
@@ -345,8 +359,57 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
+	case SKINCOLOR_BEIGE:
+		// 13 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (13*i/16 == 12)
+				dest_colormap[starttranscolor + i] = 0xDD; // darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
+		}
+		break;
+
+	case SKINCOLOR_ORANGE:
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 15)
+				dest_colormap[starttranscolor + i] = 0xEE;
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
+		}
+		break;
+
+	case SKINCOLOR_ROSEWOOD:
+		// 9 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (9*i/16 == 6)
+				dest_colormap[starttranscolor + i] = 0xEE;
+			else if (9*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0xEF;
+			else if (9*i/16 == 8)
+				dest_colormap[starttranscolor + i] = 0x47;
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
+		}
+		break;
+
+	case SKINCOLOR_GOLD:
+		// 10 color range, from 2 color ranges
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x50; // Lightest
+			else if (10*i/16 == 1)
+				dest_colormap[starttranscolor + i] = 0x53; // Second
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
 	case SKINCOLOR_TAN:
-		// 8 color rame, from 3 color ranges
+		// 8 color range, from 3 color ranges
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 == 0)
@@ -362,14 +425,60 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_BEIGE:
-		// 13 color range, from 2 color ranges
+	case SKINCOLOR_OLIVE:
+		// 7 color ramp
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
+		break;
+
+	case SKINCOLOR_YELLOW:
+		// 10 color range, from 2 color ranges
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (13*i/16 == 12)
-				dest_colormap[starttranscolor + i] = 0xDD; // darkest
+			if (10*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x53; // Lightest
+			else if (10*i/16 == 9)
+				dest_colormap[starttranscolor + i] = 0xDD; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
+		break;
+
+	case SKINCOLOR_NEONGREEN:
+		// Multi-color ramp
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0x60 + 10*i/16; // Brighter green
+			else if (10*i/16 < 9)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // Neon green
+			else
+				dest_colormap[starttranscolor + i] = 0x6F;
+		}
+		break;
+
+	case SKINCOLOR_TEAL:
+		// 6 color ramp
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (6*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0xf8; // Lightest
+			else if (6*i/16 == 5)
+				dest_colormap[starttranscolor + i] = 0x7a; // Darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (6*i/SKIN_RAMP_LENGTH) - 1);
+		}
+		break;
+
+	case SKINCOLOR_BLUE:
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 14)
+				dest_colormap[starttranscolor + i] = 0x9F;
+			else if (i == 15)
+				dest_colormap[starttranscolor + i] = 0x1F;
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		}
 		break;
 
@@ -379,6 +488,8 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		{
 			if (8*i/16 <= 1)
 				dest_colormap[starttranscolor + i] = 0x80 + 8*i/16; // Lightest
+			else if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x7B; // Darkest
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
 		}
@@ -395,108 +506,67 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_PURPLE:
-		// 12 color range, from 2 color ranges
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (12*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xEC; // Lightest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH) - 1); // main
-		}
-		break;
-
-	case SKINCOLOR_YELLOW:
-		// 13 color range, from 2 color ranges
-		// actually magenta
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (12*i/16 <= 3)
-				dest_colormap[starttranscolor + i] = 0x50 + 12*i/16; // Lightest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH) - 4); // main
-		}
-		break;
-
-	case SKINCOLOR_GOLD:
-		// 10 color rame, from 2 color ranges
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (10*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x50; // Lightest
-			else if (10*i/16 == 1)
-				dest_colormap[starttranscolor + i] = 0x53; // Second
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
-		}
-		break;
-
-	case SKINCOLOR_OLIVE:
-		// 7 color ramp
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
-		break;
-
-	case SKINCOLOR_NEONGREEN:
-		// Multi-color ramp
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0x60 + 10*i/16; // Brighter green
-			else if (10*i/16 < 9)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // Neon green
-			else
-				dest_colormap[starttranscolor + i] = 0x6F;
-		}
-		break;
-
 	// Super colors, from lightest to darkest!
 	case SKINCOLOR_SUPER1:
 		// Super White
 		for (i = 0; i < 10; i++)
-			dest_colormap[starttranscolor + i] = 120; // True white
-		for (; i < SKIN_RAMP_LENGTH; i++) // White-yellow fade
-			dest_colormap[starttranscolor + i] = (UINT8)(96 + (i-10));
+			dest_colormap[starttranscolor + i] = (UINT8)0; // True white
+		for (; i < 12; i++) // White-yellow fade
+			dest_colormap[starttranscolor + i] = (UINT8)(80);
+		for (; i < 15; i++) // White-yellow fade
+			dest_colormap[starttranscolor + i] = (UINT8)(81 + (i-12));
+		dest_colormap[starttranscolor + 15] = (UINT8)(72);
 		break;
 
 	case SKINCOLOR_SUPER2:
 		// Super Bright
-		for (i = 0; i < 5; i++) // White-yellow fade
-			dest_colormap[starttranscolor + i] = (UINT8)(96 + i);
-		dest_colormap[starttranscolor + 5] = 112; // Golden shine
-		for (i = 0; i < 8; i++) // Yellow
-			dest_colormap[starttranscolor + (i+6)] = (UINT8)(101 + (i>>1));
-		for (i = 0; i < 2; i++) // With a fine golden finish! :3
-			dest_colormap[starttranscolor + (i+14)] = (UINT8)(113 + i);
+		dest_colormap[starttranscolor] = (UINT8)(0);
+		for (i = 1; i < 4; i++) // White-yellow fade
+			dest_colormap[starttranscolor + i] = (UINT8)(80 + (i-1));
+		for (; i < 6; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(83);
+		for (; i < 8; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(72);
+		for (; i < 14; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(73);
+		for (; i < 16; i++) // With a fine golden finish! :3
+			dest_colormap[starttranscolor + i] = (UINT8)(64 + (i-14));
 		break;
 
 	case SKINCOLOR_SUPER3:
 		// Super Yellow
-		for (i = 0; i < 3; i++) // White-yellow fade
-			dest_colormap[starttranscolor + i] = (UINT8)(98 + i);
-		dest_colormap[starttranscolor + 3] = 112; // Golden shine
-		for (i = 0; i < 8; i++) // Yellow
-			dest_colormap[starttranscolor + (i+4)] = (UINT8)(101 + (i>>1));
-		for (i = 0; i < 4; i++) // With a fine golden finish! :3
-			dest_colormap[starttranscolor + (i+12)] = (UINT8)(113 + i);
+		for (i = 0; i < 2; i++) // White-yellow fade
+			dest_colormap[starttranscolor + i] = (UINT8)(81 + i);
+		for (; i < 4; i++)
+			dest_colormap[starttranscolor + i] = (UINT8)(83);
+		for (; i < 6; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(72);
+		for (; i < 12; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(73);
+		for (; i < 16; i++) // With a fine golden finish! :3
+			dest_colormap[starttranscolor + i] = (UINT8)(64 + (i-12));
 		break;
 
 	case SKINCOLOR_SUPER4:
 		// "The SSNTails"
-		dest_colormap[starttranscolor] = 112; // Golden shine
-		for (i = 0; i < 8; i++) // Yellow
-			dest_colormap[starttranscolor + (i+1)] = (UINT8)(101 + (i>>1));
-		for (i = 0; i < 7; i++) // With a fine golden finish! :3
-			dest_colormap[starttranscolor + (i+9)] = (UINT8)(113 + i);
+		dest_colormap[starttranscolor] = 83; // Golden shine
+		for (i = 1; i < 3; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(72);
+		for (; i < 9; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(73);
+		for (; i < 16; i++) // With a fine golden finish! :3
+			dest_colormap[starttranscolor + i] = (UINT8)(64 + (i-9));
 		break;
 
 	case SKINCOLOR_SUPER5:
 		// Golden Delicious
-		for (i = 0; i < 8; i++) // Yellow
-			dest_colormap[starttranscolor + i] = (UINT8)(101 + (i>>1));
-		for (i = 0; i < 7; i++) // With a fine golden finish! :3
-			dest_colormap[starttranscolor + (i+8)] = (UINT8)(113 + i);
-		dest_colormap[starttranscolor + 15] = 155;
+		for (i = 0; i < 2; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(72);
+		for (; i < 8; i++) // Yellow
+			dest_colormap[starttranscolor + i] = (UINT8)(73);
+		for (; i < 15; i++) // With a fine golden finish! :3
+			dest_colormap[starttranscolor + i] = (UINT8)(64 + (i-8));
+		dest_colormap[starttranscolor + 15] = (UINT8)63;
 		break;
 
 	// Super Tails

From e054f4b6c6703ca6a11369107c9d2510ea988ecc Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 18:56:05 +0100
Subject: [PATCH 03/15] Drawfills and Console All relevant DrawFills had
 colours changed. Console background colour changed. Text colourmapping
 changed.

---
 src/console.c  | 40 ++++++++++++++++++++--------------------
 src/d_clisrv.c |  6 +++---
 src/m_menu.c   |  2 +-
 src/r_main.c   |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/console.c b/src/console.c
index e77c400b3..1c8640396 100644
--- a/src/console.c
+++ b/src/console.c
@@ -248,11 +248,11 @@ void CON_ReSetupBackColormap(UINT16 num)
 	{
 		j = pal[i] + pal[i+1] + pal[i+2];
 		cwhitemap[k] = (UINT8)(15 - (j>>6));
-		corangemap[k] = (UINT8)(95 - (j>>6));
-		cbluemap[k] = (UINT8)(239 - (j>>6));
-		cgreenmap[k] = (UINT8)(175 - (j>>6));
+		corangemap[k] = (UINT8)(63 - (j>>6));
+		cbluemap[k] = (UINT8)(143 - (j>>6));
+		cgreenmap[k] = (UINT8)(111 - (j>>6));
 		cgraymap[k] = (UINT8)(31 - (j>>6));
-		credmap[k] = (UINT8)(143 - (j>>6));
+		credmap[k] = (UINT8)(47 - (j>>6));
 	}
 }
 
@@ -283,11 +283,11 @@ static void CON_SetupBackColormap(void)
 	{
 		j = pal[i] + pal[i+1] + pal[i+2];
 		cwhitemap[k] = (UINT8)(15 - (j>>6));
-		corangemap[k] = (UINT8)(95 - (j>>6));
-		cbluemap[k] = (UINT8)(239 - (j>>6));
-		cgreenmap[k] = (UINT8)(175 - (j>>6));
+		corangemap[k] = (UINT8)(63 - (j>>6));
+		cbluemap[k] = (UINT8)(143 - (j>>6));
+		cgreenmap[k] = (UINT8)(111 - (j>>6));
 		cgraymap[k] = (UINT8)(31 - (j>>6));
-		credmap[k] = (UINT8)(143 - (j>>6));
+		credmap[k] = (UINT8)(47 - (j>>6));
 	}
 
 	// setup the other colormaps, for console text
@@ -306,20 +306,20 @@ static void CON_SetupBackColormap(void)
 		orangemap[i] = (UINT8)i;
 	}
 
-	yellowmap[3] = (UINT8)103;
-	yellowmap[9] = (UINT8)115;
-	purplemap[3] = (UINT8)195;
-	purplemap[9] = (UINT8)198;
-	lgreenmap[3] = (UINT8)162;
-	lgreenmap[9] = (UINT8)170;
-	bluemap[3]   = (UINT8)228;
-	bluemap[9]   = (UINT8)238;
+	yellowmap[3] = (UINT8)73;
+	yellowmap[9] = (UINT8)66;
+	purplemap[3] = (UINT8)168;
+	purplemap[9] = (UINT8)170;
+	lgreenmap[3] = (UINT8)102;
+	lgreenmap[9] = (UINT8)106;
+	bluemap[3]   = (UINT8)131;
+	bluemap[9]   = (UINT8)142;
 	graymap[3]   = (UINT8)10;
 	graymap[9]   = (UINT8)15;
-	redmap[3]    = (UINT8)124;
-	redmap[9]    = (UINT8)127;
-	orangemap[3] = (UINT8)85;
-	orangemap[9] = (UINT8)90;
+	redmap[3]    = (UINT8)194;
+	redmap[9]    = (UINT8)32;
+	orangemap[3] = (UINT8)52;
+	orangemap[9] = (UINT8)57;
 }
 
 // Setup the console text buffer
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index c0179ca1b..31738e9b2 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1101,7 +1101,7 @@ static inline void CL_DrawConnectionStatus(void)
 	if (cl_mode != cl_downloadfiles)
 	{
 		INT32 i, animtime = ((ccstime / 4) & 15) + 16;
-		UINT8 palstart = (cl_mode == cl_searching) ? 128 : 160;
+		UINT8 palstart = (cl_mode == cl_searching) ? 32 : 96;
 		// 15 pal entries total.
 		const char *cltext;
 
@@ -1139,8 +1139,8 @@ static inline void CL_DrawConnectionStatus(void)
 		dldlength = (INT32)((fileneeded[lastfilenum].currentsize/(double)fileneeded[lastfilenum].totalsize) * 256);
 		if (dldlength > 256)
 			dldlength = 256;
-		V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
-		V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 160);
+		V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
+		V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96);
 
 		memset(tempname, 0, sizeof(tempname));
 		nameonly(strncpy(tempname, fileneeded[lastfilenum].filename, 31));
diff --git a/src/m_menu.c b/src/m_menu.c
index 06aaac0ef..111be9479 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2820,7 +2820,7 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv)
 void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
 {
 	// Solid color textbox.
-	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239);
+	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 143);
 	//V_DrawFill(x+8, y+8, width*8, boxlines*8, 31);
 /*
 	patch_t *p;
diff --git a/src/r_main.c b/src/r_main.c
index ffd4d5d50..77d6a456c 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1282,7 +1282,7 @@ void R_RenderPlayerView(player_t *player)
 		if (cv_homremoval.value == 1)
 			V_DrawFill(0, 0, vid.width, vid.height, 31); // No HOM effect!
 		else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
-			V_DrawFill(0, 0, vid.width, vid.height, 128+(timeinmap&15));
+			V_DrawFill(0, 0, vid.width, vid.height, 32+(timeinmap&15));
 	}
 
 	portalrender = 0;

From 721a5f9b4b57fd1c4237cde298b665e2b91f93ca Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 21:43:30 +0100
Subject: [PATCH 04/15] Default Translation color + Neon Green change

---
 src/r_draw.c   | 30 ++++++++++++++----------------
 src/r_things.c |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 6689e6c29..5f4f28cfc 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -121,7 +121,7 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
 #define METALSONIC_TT_CACHE_INDEX (MAXSKINS + 2)
 #define ALLWHITE_TT_CACHE_INDEX (MAXSKINS + 3)
 #define SKIN_RAMP_LENGTH 16
-#define DEFAULT_STARTTRANSCOLOR 160
+#define DEFAULT_STARTTRANSCOLOR 96
 #define NUM_PALETTE_ENTRIES 256
 
 static UINT8** translationtablecache[MAXSKINS + 4] = {NULL};
@@ -347,7 +347,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_PEACH:
-		// 10 color rame, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -360,7 +360,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_BEIGE:
-		// 13 color range, from 2 color ranges
+		// 13 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (13*i/16 == 12)
@@ -396,7 +396,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_GOLD:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -409,7 +409,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_TAN:
-		// 8 color range, from 3 color ranges
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 == 0)
@@ -426,13 +426,13 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_OLIVE:
-		// 7 color ramp
+		// 7 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
 		break;
 
 	case SKINCOLOR_YELLOW:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -445,20 +445,18 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_NEONGREEN:
-		// Multi-color ramp
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0x60 + 10*i/16; // Brighter green
-			else if (10*i/16 < 9)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // Neon green
+			if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x6E; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = 0x6F;
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH)); // Neon green
 		}
 		break;
 
 	case SKINCOLOR_TEAL:
-		// 6 color ramp
+		// 6 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (6*i/16 == 0)
@@ -483,7 +481,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_STEELBLUE:
-		// 8 color range, from 2 color ranges
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 <= 1)
@@ -496,7 +494,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_LAVENDER:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 <= 1)
diff --git a/src/r_things.c b/src/r_things.c
index 9a8b1319b..3b46d4d3d 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2235,7 +2235,7 @@ static void Sk_SetDefaultValue(skin_t *skin)
 	strncpy(skin->face, "MISSING", 8);
 	strncpy(skin->superface, "MISSING", 8);
 
-	skin->starttranscolor = 160;
+	skin->starttranscolor = 96;
 	skin->prefcolor = SKINCOLOR_GREEN;
 
 	skin->normalspeed = 36<<FRACBITS;

From 1dd28ef15ae572f92c30554407b1a96fe48e2bbf Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 22:57:54 +0100
Subject: [PATCH 05/15] Rearange colours to be in more correct order

---
 src/r_draw.c | 174 +++++++++++++++++++++++++--------------------------
 1 file changed, 87 insertions(+), 87 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 5f4f28cfc..50c449624 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -321,28 +321,41 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
-	case SKINCOLOR_RED:
+	case SKINCOLOR_TEAL:
+		// 6 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (i == 13)
-				dest_colormap[starttranscolor + i] = 0x47;
-			else if (i > 13)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 1);
+			if (6*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0xf8; // Lightest
+			else if (6*i/16 == 5)
+				dest_colormap[starttranscolor + i] = 0x7a; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (6*i/SKIN_RAMP_LENGTH) - 1);
 		}
 		break;
 
-	case SKINCOLOR_DARKRED:
-		// 9 colors
+	case SKINCOLOR_STEELBLUE:
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (9*i/16 == 6)
-				dest_colormap[starttranscolor + i] = 0x47;
-			else if (9*i/16 > 6)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH) - 1);
+			if (8*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0x80 + 8*i/16; // Lightest
+			else if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x7B; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
+		}
+		break;
+
+	case SKINCOLOR_BLUE:
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 14)
+				dest_colormap[starttranscolor + i] = 0x9F;
+			else if (i == 15)
+				dest_colormap[starttranscolor + i] = 0x1F;
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		}
 		break;
 
@@ -359,14 +372,31 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_BEIGE:
-		// 13 colors
+	case SKINCOLOR_TAN:
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (13*i/16 == 12)
-				dest_colormap[starttranscolor + i] = 0xDD; // darkest
+			if (8*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x51; // Lightest 1
+			else if (8*i/16 == 5)
+				dest_colormap[starttranscolor + i] = 0xE5; // Darkest 1
+			else if (8*i/16 == 6)
+				dest_colormap[starttranscolor + i] = 0xE9; // Darkest 2
+			else if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0xDD; // Darkest 3
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
+		break;
+
+	case SKINCOLOR_LAVENDER:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 <= 1)
+				dest_colormap[starttranscolor + i] = 0xEC + 10*i/16; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
 		}
 		break;
 
@@ -395,33 +425,50 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_GOLD:
-		// 10 colors
+	case SKINCOLOR_BEIGE:
+		// 13 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x50; // Lightest
-			else if (10*i/16 == 1)
-				dest_colormap[starttranscolor + i] = 0x53; // Second
+			if (13*i/16 == 12)
+				dest_colormap[starttranscolor + i] = 0xDD; // darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
 		}
 		break;
 
-	case SKINCOLOR_TAN:
+	case SKINCOLOR_RED:
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 13)
+				dest_colormap[starttranscolor + i] = 0x47;
+			else if (i > 13)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 1);
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
+		}
+		break;
+
+	case SKINCOLOR_DARKRED:
+		// 9 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (9*i/16 == 6)
+				dest_colormap[starttranscolor + i] = 0x47;
+			else if (9*i/16 > 6)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH) - 1);
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
+		}
+		break;
+
+	case SKINCOLOR_NEONGREEN:
 		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (8*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x51; // Lightest 1
-			else if (8*i/16 == 5)
-				dest_colormap[starttranscolor + i] = 0xE5; // Darkest 1
-			else if (8*i/16 == 6)
-				dest_colormap[starttranscolor + i] = 0xE9; // Darkest 2
-			else if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0xDD; // Darkest 3
+			if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x6E; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH)); // Neon green
 		}
 		break;
 
@@ -444,61 +491,14 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_NEONGREEN:
-		// 8 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0x6E; // Darkest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH)); // Neon green
-		}
-		break;
-
-	case SKINCOLOR_TEAL:
-		// 6 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (6*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xf8; // Lightest
-			else if (6*i/16 == 5)
-				dest_colormap[starttranscolor + i] = 0x7a; // Darkest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (6*i/SKIN_RAMP_LENGTH) - 1);
-		}
-		break;
-
-	case SKINCOLOR_BLUE:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (i == 14)
-				dest_colormap[starttranscolor + i] = 0x9F;
-			else if (i == 15)
-				dest_colormap[starttranscolor + i] = 0x1F;
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
-		}
-		break;
-
-	case SKINCOLOR_STEELBLUE:
-		// 8 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (8*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0x80 + 8*i/16; // Lightest
-			else if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0x7B; // Darkest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
-		}
-		break;
-
-	case SKINCOLOR_LAVENDER:
+	case SKINCOLOR_GOLD:
 		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0xEC + 10*i/16; // Lightest
+			if (10*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x50; // Lightest
+			else if (10*i/16 == 1)
+				dest_colormap[starttranscolor + i] = 0x53; // Second
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
 		}

From 9847668863bbd6bcc8d8db097a48e5785ec32a9a Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Fri, 24 Jul 2015 23:39:53 +0100
Subject: [PATCH 06/15] New Colours

---
 src/dehacked.c |  5 ++-
 src/doomdef.h  |  5 ++-
 src/r_draw.c   | 82 +++++++++++++++++++++++++++++++++++++++++---------
 src/st_stuff.c |  2 +-
 4 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index a332da5df..2f50afaa7 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7310,14 +7310,17 @@ static const char *COLOR_ENUMS[] = {
 	"GREY",	    	// SKINCOLOR_GREY
 	"BLACK",    	// SKINCOLOR_BLACK
 	"CYAN",     	// SKINCOLOR_CYAN
+	"AQUAMARINE",   // SKINCOLOR_AQUAMARINE
 	"TEAL",     	// SKINCOLOR_TEAL
 	"STEELBLUE",	// SKINCOLOR_STEELBLUE
 	"BLUE",     	// SKINCOLOR_BLUE
 	"PEACH",    	// SKINCOLOR_PEACH
 	"TAN",      	// SKINCOLOR_TAN
 	"PINK",     	// SKINCOLOR_PINK
+	"ROSY",     	// SKINCOLOR_ROSY
 	"LAVENDER", 	// SKINCOLOR_LAVENDER
 	"PURPLE",   	// SKINCOLOR_PURPLE
+	"MAGENTA",   	// SKINCOLOR_MAGENTA
 	"ORANGE",   	// SKINCOLOR_ORANGE
 	"ROSEWOOD", 	// SKINCOLOR_ROSEWOOD
 	"BEIGE",    	// SKINCOLOR_BEIGE
@@ -7327,7 +7330,7 @@ static const char *COLOR_ENUMS[] = {
 	"NEONGREEN",	// SKINCOLOR_NEONGREEN
 	"GREEN",    	// SKINCOLOR_GREEN
 	"ZIM",      	// SKINCOLOR_ZIM
-	"OLIVE",    	// SKINCOLOR_OLIVE
+	"PERIDOT",    	// SKINCOLOR_PERIDOT
 	"YELLOW",   	// SKINCOLOR_YELLOW
 	"GOLD"      	// SKINCOLOR_GOLD
 };
diff --git a/src/doomdef.h b/src/doomdef.h
index 4a6d6e576..1e7edd207 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -231,14 +231,17 @@ typedef enum
 	SKINCOLOR_GREY,
 	SKINCOLOR_BLACK,
 	SKINCOLOR_CYAN,
+	SKINCOLOR_AQUAMARINE,
 	SKINCOLOR_TEAL,
 	SKINCOLOR_STEELBLUE,
 	SKINCOLOR_BLUE,
 	SKINCOLOR_PEACH,
 	SKINCOLOR_TAN,
 	SKINCOLOR_PINK,
+	SKINCOLOR_ROSY,
 	SKINCOLOR_LAVENDER,
 	SKINCOLOR_PURPLE,
+	SKINCOLOR_MAGENTA,
 	SKINCOLOR_ORANGE,
 	SKINCOLOR_ROSEWOOD,
 	SKINCOLOR_BEIGE,
@@ -248,7 +251,7 @@ typedef enum
 	SKINCOLOR_NEONGREEN,
 	SKINCOLOR_GREEN,
 	SKINCOLOR_ZIM,
-	SKINCOLOR_OLIVE,
+	SKINCOLOR_PERIDOT,
 	SKINCOLOR_YELLOW,
 	SKINCOLOR_GOLD,
 
diff --git a/src/r_draw.c b/src/r_draw.c
index 50c449624..f1955c6c0 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -137,14 +137,17 @@ const char *Color_Names[MAXSKINCOLORS] =
 	"Grey",      // SKINCOLOR_GREY
 	"Black",     // SKINCOLOR_BLACK
 	"Cyan",      // SKINCOLOR_CYAN
+	"Aquamarine",// SKINCOLOR_AQUAMARINE
 	"Teal",      // SKINCOLOR_TEAL
 	"Steel_Blue",// SKINCOLOR_STEELBLUE
 	"Blue",      // SKINCOLOR_BLUE
 	"Peach",     // SKINCOLOR_PEACH
 	"Tan",       // SKINCOLOR_TAN
 	"Pink",      // SKINCOLOR_PINK
+	"Rosy",      // SKINCOLOR_ROSY
 	"Lavender",  // SKINCOLOR_LAVENDER
 	"Purple",    // SKINCOLOR_PURPLE
+	"Magenta",   // SKINCOLOR_MAGENTA
 	"Orange",    // SKINCOLOR_ORANGE
 	"Rosewood",  // SKINCOLOR_ROSEWOOD
 	"Beige",     // SKINCOLOR_BEIGE
@@ -154,7 +157,7 @@ const char *Color_Names[MAXSKINCOLORS] =
 	"Neon_Green",// SKINCOLOR_NEONGREEN
 	"Green",     // SKINCOLOR_GREEN
 	"Zim",       // SKINCOLOR_ZIM
-	"Olive",     // SKINCOLOR_OLIVE
+	"Peridot",   // SKINCOLOR_PERIDOT
 	"Yellow",    // SKINCOLOR_YELLOW
 	"Gold"       // SKINCOLOR_GOLD
 };
@@ -167,14 +170,17 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_SILVER,12,// SKINCOLOR_GREY
 	SKINCOLOR_WHITE,8,  // SKINCOLOR_BLACK
 	SKINCOLOR_NONE,8,   // SKINCOLOR_CYAN
+	SKINCOLOR_NONE,8,   // SKINCOLOR_AQUAMARINE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_TEAL
 	SKINCOLOR_NONE,8,   // SKINCOLOR_STEELBLUE
 	SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PEACH
 	SKINCOLOR_NONE,8,   // SKINCOLOR_TAN
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PINK
+	SKINCOLOR_NONE,8,   // SKINCOLOR_ROSY
 	SKINCOLOR_NONE,8,   // SKINCOLOR_LAVENDER
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PURPLE
+	SKINCOLOR_NONE,8,   // SKINCOLOR_MAGENTA
 	SKINCOLOR_BLUE,12,  // SKINCOLOR_ORANGE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_ROSEWOOD
 	SKINCOLOR_NONE,8,   // SKINCOLOR_BEIGE
@@ -183,8 +189,8 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_NONE,8,   // SKINCOLOR_DARKRED
 	SKINCOLOR_NONE,8,   // SKINCOLOR_NEONGREEN
 	SKINCOLOR_RED,11,   // SKINCOLOR_GREEN
-	SKINCOLOR_PURPLE,3, // SKINCOLOR_ZIM
-	SKINCOLOR_NONE,8,   // SKINCOLOR_OLIVE
+	SKINCOLOR_MAGENTA,3, // SKINCOLOR_ZIM
+	SKINCOLOR_NONE,8,   // SKINCOLOR_PERIDOT
 	SKINCOLOR_NONE,8,   // SKINCOLOR_YELLOW
 	SKINCOLOR_NONE,8    // SKINCOLOR_GOLD
 };
@@ -237,14 +243,17 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x08, // SKINCOLOR_GREY
 		0x18, // SKINCOLOR_BLACK
 		0x70, // SKINCOLOR_CYAN
+		0xf8, // SKINCOLOR_AQUAMARINE
 		0x7c, // SKINCOLOR_TEAL
 		0x9a, // SKINCOLOR_STEELBLUE
 		0x82, // SKINCOLOR_BLUE
 		0xc8, // SKINCOLOR_PEACH
 		0x54, // SKINCOLOR_TAN
 		0xc0, // SKINCOLOR_PINK
+		0xb8, // SKINCOLOR_ROSY
 		0xb0, // SKINCOLOR_LAVENDER
-		0xa3, // SKINCOLOR_PURPLE
+		0x90, // SKINCOLOR_PURPLE
+		0xa3, // SKINCOLOR_MAGENTA
 		0x31, // SKINCOLOR_ORANGE
 		0x3a, // SKINCOLOR_ROSEWOOD
 		0xe0, // SKINCOLOR_BEIGE
@@ -254,7 +263,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0xf0, // SKINCOLOR_NEONGREEN
 		0x60, // SKINCOLOR_GREEN
 		0x58, // SKINCOLOR_ZIM
-		0x49, // SKINCOLOR_OLIVE
+		0xac, // SKINCOLOR_PERIDOT
 		0x48, // SKINCOLOR_YELLOW
 		0x40, // SKINCOLOR_GOLD
 	};
@@ -307,6 +316,12 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_PURPLE:
+		// 10 color ramp
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH));
+		break;
+
+	case SKINCOLOR_MAGENTA:
 		// 9 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
@@ -321,6 +336,17 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
+	case SKINCOLOR_AQUAMARINE:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (10*i/16 >= 8)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x6C + (10*i/SKIN_RAMP_LENGTH) - 8); // Darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH));
+		}
+		break;
+
 	case SKINCOLOR_TEAL:
 		// 6 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
@@ -339,7 +365,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0x80 + 8*i/16; // Lightest
+				dest_colormap[starttranscolor + i] = (UINT8)(0x80 + 8*i/16); // Lightest
 			else if (8*i/16 == 7)
 				dest_colormap[starttranscolor + i] = 0x7B; // Darkest
 			else
@@ -389,12 +415,29 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
+	case SKINCOLOR_ROSY:
+		// 15 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (15*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0xEC; // Lightest
+			else if (15*i/16 == 12)
+				dest_colormap[starttranscolor + i] = 0x47; // Dark Shade
+			else if (15*i/16 >= 13)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x2E + (15*i/SKIN_RAMP_LENGTH) - 13); // Darkest
+			else if (15*i/16 >= 9)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x2B + (15*i/SKIN_RAMP_LENGTH) - 9); // Darkish
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (15*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
+		break;
+
 	case SKINCOLOR_LAVENDER:
 		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0xEC + 10*i/16; // Lightest
+				dest_colormap[starttranscolor + i] = (UINT8)(0xEC + 10*i/16); // Lightest
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
 		}
@@ -472,22 +515,31 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_OLIVE:
-		// 7 colors
+	case SKINCOLOR_PERIDOT:
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
+		{
+			if (8*i/16 == 0)
+				dest_colormap[starttranscolor + i] = 0x48; // Lightest
+			else if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x6D; // Darkest
+			else if (8*i/16 >= 5)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x5E + (8*i/SKIN_RAMP_LENGTH) - 5); // Darkish
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
+		}
 		break;
 
 	case SKINCOLOR_YELLOW:
-		// 10 colors
+		// 9 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x53; // Lightest
-			else if (10*i/16 == 9)
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = 0x48; // Lightest
+			else if (i == 15)
 				dest_colormap[starttranscolor + i] = 0xDD; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 1); // main
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*(i-1)/SKIN_RAMP_LENGTH));
 		}
 		break;
 
diff --git a/src/st_stuff.c b/src/st_stuff.c
index a9bdacf71..58992bea4 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -889,7 +889,7 @@ static void ST_drawFirstPersonHUD(void)
 // [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold
 static skincolors_t linkColor[14] =
 {SKINCOLOR_BEIGE,  SKINCOLOR_LAVENDER, SKINCOLOR_STEELBLUE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
- SKINCOLOR_PURPLE, SKINCOLOR_SILVER,   SKINCOLOR_SUPER4,    SKINCOLOR_PINK,  SKINCOLOR_RED,
+ SKINCOLOR_MAGENTA, SKINCOLOR_SILVER,   SKINCOLOR_SUPER4,    SKINCOLOR_PINK,  SKINCOLOR_RED,
  SKINCOLOR_BLUE,   SKINCOLOR_GREEN,    SKINCOLOR_CYAN,      SKINCOLOR_GOLD};
 
 static void ST_drawNightsRecords(void)

From c6c67d45b0d4dcb8f3486e9c094406c825eb1da1 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Sat, 25 Jul 2015 00:14:50 +0100
Subject: [PATCH 07/15] Fix Purple

---
 src/r_draw.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index f1955c6c0..f54d2f171 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -315,12 +315,6 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH));
 		break;
 
-	case SKINCOLOR_PURPLE:
-		// 10 color ramp
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH));
-		break;
-
 	case SKINCOLOR_MAGENTA:
 		// 9 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
@@ -443,6 +437,17 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
+	case SKINCOLOR_PURPLE:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i <= 3)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i); // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) + 2); // main
+		}
+		break;
+
 	case SKINCOLOR_ORANGE:
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{

From 14b157b98d532c7a5f8dbf3b6a5afefeb4936835 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Sat, 25 Jul 2015 13:35:11 +0100
Subject: [PATCH 08/15] Fix yellow

---
 src/r_draw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index f54d2f171..808b3cc6e 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -536,15 +536,15 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_YELLOW:
-		// 9 colors
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (i == 0)
-				dest_colormap[starttranscolor + i] = 0x48; // Lightest
+				dest_colormap[starttranscolor + i] = 0x53; // Lightest
 			else if (i == 15)
 				dest_colormap[starttranscolor + i] = 0xDD; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*(i-1)/SKIN_RAMP_LENGTH));
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH));
 		}
 		break;
 

From 5209787ebd32dce34de130ac4ad92bceb66bc068 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Sat, 25 Jul 2015 14:07:05 +0100
Subject: [PATCH 09/15] Rename Colours

---
 src/dehacked.c | 10 +++++-----
 src/doomdef.h  | 10 +++++-----
 src/g_game.c   |  2 +-
 src/m_cond.c   | 52 +++++++++++++++++++++++++-------------------------
 src/r_draw.c   | 40 +++++++++++++++++++-------------------
 src/st_stuff.c |  6 +++---
 6 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 2f50afaa7..760ae84b3 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7310,9 +7310,9 @@ static const char *COLOR_ENUMS[] = {
 	"GREY",	    	// SKINCOLOR_GREY
 	"BLACK",    	// SKINCOLOR_BLACK
 	"CYAN",     	// SKINCOLOR_CYAN
-	"AQUAMARINE",   // SKINCOLOR_AQUAMARINE
+	"AQUA",     	// SKINCOLOR_AQUA
 	"TEAL",     	// SKINCOLOR_TEAL
-	"STEELBLUE",	// SKINCOLOR_STEELBLUE
+	"AZURE",    	// SKINCOLOR_AZURE
 	"BLUE",     	// SKINCOLOR_BLUE
 	"PEACH",    	// SKINCOLOR_PEACH
 	"TAN",      	// SKINCOLOR_TAN
@@ -7322,12 +7322,12 @@ static const char *COLOR_ENUMS[] = {
 	"PURPLE",   	// SKINCOLOR_PURPLE
 	"MAGENTA",   	// SKINCOLOR_MAGENTA
 	"ORANGE",   	// SKINCOLOR_ORANGE
-	"ROSEWOOD", 	// SKINCOLOR_ROSEWOOD
+	"RUST",     	// SKINCOLOR_RUST
 	"BEIGE",    	// SKINCOLOR_BEIGE
 	"BROWN",    	// SKINCOLOR_BROWN
 	"RED",      	// SKINCOLOR_RED
-	"DARKRED",  	// SKINCOLOR_DARKRED
-	"NEONGREEN",	// SKINCOLOR_NEONGREEN
+	"CRIMSON",     	// SKINCOLOR_CRIMSON
+	"EMERALD",  	// SKINCOLOR_EMERALD
 	"GREEN",    	// SKINCOLOR_GREEN
 	"ZIM",      	// SKINCOLOR_ZIM
 	"PERIDOT",    	// SKINCOLOR_PERIDOT
diff --git a/src/doomdef.h b/src/doomdef.h
index 1e7edd207..d6af0f1a0 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -231,9 +231,9 @@ typedef enum
 	SKINCOLOR_GREY,
 	SKINCOLOR_BLACK,
 	SKINCOLOR_CYAN,
-	SKINCOLOR_AQUAMARINE,
+	SKINCOLOR_AQUA,
 	SKINCOLOR_TEAL,
-	SKINCOLOR_STEELBLUE,
+	SKINCOLOR_AZURE,
 	SKINCOLOR_BLUE,
 	SKINCOLOR_PEACH,
 	SKINCOLOR_TAN,
@@ -243,12 +243,12 @@ typedef enum
 	SKINCOLOR_PURPLE,
 	SKINCOLOR_MAGENTA,
 	SKINCOLOR_ORANGE,
-	SKINCOLOR_ROSEWOOD,
+	SKINCOLOR_RUST,
 	SKINCOLOR_BEIGE,
 	SKINCOLOR_BROWN,
 	SKINCOLOR_RED,
-	SKINCOLOR_DARKRED,
-	SKINCOLOR_NEONGREEN,
+	SKINCOLOR_CRIMSON,
+	SKINCOLOR_EMERALD,
 	SKINCOLOR_GREEN,
 	SKINCOLOR_ZIM,
 	SKINCOLOR_PERIDOT,
diff --git a/src/g_game.c b/src/g_game.c
index c59f23c07..17734da64 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -123,7 +123,7 @@ boolean useNightsSS = false;
 UINT8 skincolor_redteam = SKINCOLOR_RED;
 UINT8 skincolor_blueteam = SKINCOLOR_BLUE;
 UINT8 skincolor_redring = SKINCOLOR_RED;
-UINT8 skincolor_bluering = SKINCOLOR_STEELBLUE;
+UINT8 skincolor_bluering = SKINCOLOR_AZURE;
 
 tic_t countdowntimer = 0;
 boolean countdowntimeup = false;
diff --git a/src/m_cond.c b/src/m_cond.c
index 17f755120..7ef192f7b 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -49,7 +49,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Streams come to an end\n"
 		"where they can no longer fall.\n"
 		"But if you went up...", 0},
-	{0,  -336,  2064,   195, 1, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  -336,  2064,   195, 1, 'E', SKINCOLOR_EMERALD, 0,
 		"This one's in plain sight.\n"
 		"Why haven't you claimed it?\n"
 		"Surely you saw it.", 0},
@@ -77,7 +77,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Near the level's end,\n"
 		"another bridge spans a lake.\n"
 		"What could be under...?", 0},
-	{0,  -170,   491,  3821, 2, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  -170,   491,  3821, 2, 'E', SKINCOLOR_EMERALD, 0,
 		"An ivied tunnel\n"
 		"has a corner that's sunlit.\n"
 		"Go reach for the sky!", 0},
@@ -110,7 +110,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Spinning through small gaps\n"
 		"can slip you into a cave.\n"
 		"In that cave's first stretch...", 0},
-	{0,  2848, -9088,   488, 4, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  2848, -9088,   488, 4, 'E', SKINCOLOR_EMERALD, 0,
 		"The slime lake is deep,\n"
 		"but reaching the floor takes height.\n"
 		"Scream \"Geronimo!\"...", 0},
@@ -138,7 +138,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"There is a hallway\n"
 		"that a button floods with slime.\n"
 		"Go through it again!", 0},
-	{0, -2468,-12128,  1312, 5, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, -2468,-12128,  1312, 5, 'E', SKINCOLOR_EMERALD, 0,
 		"Jumping on turtles\n"
 		"will send you springing skyward.\n"
 		"Now, do that six times...", 0},
@@ -171,7 +171,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"A caved-in hallway?\n"
 		"The floor falls; the path goes down.\n"
 		"But those rocks looked weak...", 0},
-	{0, 12576, 16096,  -992, 7, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, 12576, 16096,  -992, 7, 'E', SKINCOLOR_EMERALD, 0,
 		"The end is quite dry.\n"
 		"Some rocks dam the water in.\n"
 		"Knuckles can fix that...", 0},
@@ -199,7 +199,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"In the current maze\n"
 		"hides a dark room of columns.\n"
 		"Find it, then look up.", 0},
-	{0,  3104, 16192,  2408, 8, 'E', SKINCOLOR_NEONGREEN,  0,
+	{0,  3104, 16192,  2408, 8, 'E', SKINCOLOR_EMERALD,  0,
 		"That same dragon's eye\n"
 		"hides another secret room.\n"
 		"There, solve its riddle.", 0},
@@ -232,7 +232,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"The final approach!\n"
 		"A tower holds the emblem\n"
 		"near a ring arrow.", 0},
-	{0,  9472, -5890,   710, 10, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  9472, -5890,   710, 10, 'E', SKINCOLOR_EMERALD, 0,
 		"The right starting path\n"
 		"hides this near a canopy,\n"
 		"high, where two trees meet.", 0},
@@ -260,7 +260,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Some of these bookshelves\n"
 		"are not flush against the walls.\n"
 		"Wonder why that is?", 0},
-	{0, 12708,-13536,  4768, 11, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, 12708,-13536,  4768, 11, 'E', SKINCOLOR_EMERALD, 0,
 		"The ending's towers\n"
 		"are hiding a small alcove.\n"
 		"Check around outside.", 0},
@@ -293,7 +293,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Not far from the start,\n"
 		"if you climb toward the sky,\n"
 		"the cliffs hide something.", 0},
-	{0, 12504,  6848,  3424, 13, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, 12504,  6848,  3424, 13, 'E', SKINCOLOR_EMERALD, 0,
 		"Right by the exit,\n"
 		"an emblem lies on a cliff.\n"
 		"Ride ropes to reach it.", 0},
@@ -321,7 +321,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Where once a bridge stood,\n"
 		"now magma falls from above.\n"
 		"The bridge dropped something...", 0},
-	{0,  8287,-11043,  1328, 16, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  8287,-11043,  1328, 16, 'E', SKINCOLOR_EMERALD, 0,
 		"A lake of magma\n"
 		"ebbs and flows unendingly.\n"
 		"Wait for its nadir.", 0},
@@ -349,7 +349,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Don't jump too high here!\n"
 		"No conveyor will catch you;\n"
 		"you'd fall to your death.", 0},
-	{0, -6432, -6192,   584, 22, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, -6432, -6192,   584, 22, 'E', SKINCOLOR_EMERALD, 0,
 		"Conveyors! Magma!\n"
 		"What an intense room this is!\n"
 		"But, what brought you here?", 0},
@@ -377,7 +377,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Gears with missing teeth\n"
 		"can hide a clever secret!\n"
 		"Think Green Hill Zone boss.", 0},
-	{0,  1920, 20608,  1064, 23, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,  1920, 20608,  1064, 23, 'E', SKINCOLOR_EMERALD, 0,
 		"Just before you reach\n"
 		"the defective cargo bay,\n"
 		"fly under a bridge.", 0},
@@ -398,7 +398,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"[PH] In the ceiling of the conveyor belt + laser hallway.", 0},
 	{0,-13728,-13728,  1552, 24, 'D', SKINCOLOR_ORANGE, 0,
 		"[PH] On top of the platform with rows of spikes in reverse gravity.", 0},
-	{0,-14944,   768,  1232, 24, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0,-14944,   768,  1232, 24, 'E', SKINCOLOR_EMERALD, 0,
 		"Follow the leader.", 0},
 */
 
@@ -430,7 +430,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"The underground room\n"
 		"with platforms that fall and rise\n"
 		"only LOOKS empty...", 0},
-	{0 , 4960, -6112,  1312, 30, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0 , 4960, -6112,  1312, 30, 'E', SKINCOLOR_EMERALD, 0,
 		"This one's straightforward.\n"
 		"What comes to mind when I say:\n"
 		"\"WELCOME TO WARP ZONE!\"?", 0},
@@ -458,7 +458,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"Much like the last one,\n"
 		"you need to find some switches.\n"
 		"Only two, this time.", 0},
-	{0, 13184, 18880,  6672, 40, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, 13184, 18880,  6672, 40, 'E', SKINCOLOR_EMERALD, 0,
 		"The inner sanctum!\n"
 		"Teleport to its switches;\n"
 		"then, check near the goal.", 0},
@@ -486,7 +486,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 		"A room of currents;\n"
 		"most of them are marked by spikes.\n"
 		"This one? A corner.", 0},
-	{0, -4128, 21344,  1120, 41, 'E', SKINCOLOR_NEONGREEN, 0,
+	{0, -4128, 21344,  1120, 41, 'E', SKINCOLOR_EMERALD, 0,
 		"The only way to hit\n"
 		"all those gems at once is with\n"
 		"a radial blast.", 0},
@@ -498,63 +498,63 @@ emblem_t emblemlocations[MAXEMBLEMS] =
 
 	// FLORAL FIELD
 	// ---
-	{0, 5394, -996, 160, 50, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 5394, -996, 160, 50, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,   50, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,   50, 'T', SKINCOLOR_GREY,  40*TICRATE, "", 0},
 
 
 	// TOXIC PLATEAU
 	// ---
-	{0, 780, -1664, 32, 51, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 780, -1664, 32, 51, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,  51, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,  51, 'T', SKINCOLOR_GREY,  50*TICRATE, "", 0},
 
 
 	// FLOODED COVE
 	// ---
-	{0, 1824, -1888, 2448, 52, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 1824, -1888, 2448, 52, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,     52, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,     52, 'T', SKINCOLOR_GREY,  90*TICRATE, "", 0},
 
 
 	// CAVERN FORTRESS
 	// ---
-	{0, -3089, -431, 1328, 53, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, -3089, -431, 1328, 53, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,     53, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,     53, 'T', SKINCOLOR_GREY,  75*TICRATE, "", 0},
 
 
 	// DUSTY WASTELAND
 	// ---
-	{0, 957, 924, 2956, 54, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 957, 924, 2956, 54, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,  54, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,  54, 'T', SKINCOLOR_GREY,  65*TICRATE, "", 0},
 
 
 	// MAGMA CAVES
 	// ---
-	{0, -2752, 3104, 1800, 55, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, -2752, 3104, 1800, 55, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,     55, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,     55, 'T', SKINCOLOR_GREY,  80*TICRATE, "", 0},
 
 
 	// EGG SATELLITE
 	// ---
-	{0, 5334, -609, 3426, 56, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 5334, -609, 3426, 56, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,    56, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,    56, 'T', SKINCOLOR_GREY, 120*TICRATE, "", 0},
 
 
 	// BLACK HOLE
 	// ---
-	{0, 2108, 3776, 32, 57, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, 2108, 3776, 32, 57, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,  57, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,  57, 'T', SKINCOLOR_GREY, 150*TICRATE, "", 0},
 
 
 	// SPRING HILL
 	// ---
-	{0, -1840, -1024, 1644, 58, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0},
+	{0, -1840, -1024, 1644, 58, 'N', SKINCOLOR_RUST, 0, "", 0},
 	{ET_NGRADE, 0,0,0,      58, 'Q', SKINCOLOR_TEAL,     GRADE_A, "", 0},
 	{ET_NTIME,  0,0,0,      58, 'T', SKINCOLOR_GREY,  60*TICRATE, "", 0},
 };
@@ -565,7 +565,7 @@ extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
 	{"Game Complete",  "Complete 1P Mode",                    10, 'X', SKINCOLOR_BLUE, 0},
 	{"All Emeralds",   "Complete 1P Mode with all Emeralds",  11, 'V', SKINCOLOR_GREY, 0},
 	{"Perfect Bonus",  "Perfect Bonus on a non-secret stage", 30, 'P', SKINCOLOR_GOLD, 0},
-	{"SRB1 Remake",    "Complete SRB1 Remake",                21, 'O', SKINCOLOR_ROSEWOOD, 0},
+	{"SRB1 Remake",    "Complete SRB1 Remake",                21, 'O', SKINCOLOR_RUST, 0},
 	{"NiGHTS Mastery", "Show your mastery of NiGHTS!",        22, 'W', SKINCOLOR_TEAL, 0},
 };
 
diff --git a/src/r_draw.c b/src/r_draw.c
index 808b3cc6e..4f06a58a7 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -137,9 +137,9 @@ const char *Color_Names[MAXSKINCOLORS] =
 	"Grey",      // SKINCOLOR_GREY
 	"Black",     // SKINCOLOR_BLACK
 	"Cyan",      // SKINCOLOR_CYAN
-	"Aquamarine",// SKINCOLOR_AQUAMARINE
+	"Aqua",      // SKINCOLOR_AQUAMARINE
 	"Teal",      // SKINCOLOR_TEAL
-	"Steel_Blue",// SKINCOLOR_STEELBLUE
+	"Azure",     // SKINCOLOR_AZURE
 	"Blue",      // SKINCOLOR_BLUE
 	"Peach",     // SKINCOLOR_PEACH
 	"Tan",       // SKINCOLOR_TAN
@@ -149,12 +149,12 @@ const char *Color_Names[MAXSKINCOLORS] =
 	"Purple",    // SKINCOLOR_PURPLE
 	"Magenta",   // SKINCOLOR_MAGENTA
 	"Orange",    // SKINCOLOR_ORANGE
-	"Rosewood",  // SKINCOLOR_ROSEWOOD
+	"Rust",      // SKINCOLOR_RUST
 	"Beige",     // SKINCOLOR_BEIGE
 	"Brown",     // SKINCOLOR_BROWN
 	"Red",       // SKINCOLOR_RED
-	"Dark_Red",  // SKINCOLOR_DARKRED
-	"Neon_Green",// SKINCOLOR_NEONGREEN
+	"Crimson",   // SKINCOLOR_CRIMSON
+	"Emerald",   // SKINCOLOR_EMERALD
 	"Green",     // SKINCOLOR_GREEN
 	"Zim",       // SKINCOLOR_ZIM
 	"Peridot",   // SKINCOLOR_PERIDOT
@@ -170,9 +170,9 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_SILVER,12,// SKINCOLOR_GREY
 	SKINCOLOR_WHITE,8,  // SKINCOLOR_BLACK
 	SKINCOLOR_NONE,8,   // SKINCOLOR_CYAN
-	SKINCOLOR_NONE,8,   // SKINCOLOR_AQUAMARINE
+	SKINCOLOR_NONE,8,   // SKINCOLOR_AQUA
 	SKINCOLOR_NONE,8,   // SKINCOLOR_TEAL
-	SKINCOLOR_NONE,8,   // SKINCOLOR_STEELBLUE
+	SKINCOLOR_NONE,8,   // SKINCOLOR_AZURE
 	SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PEACH
 	SKINCOLOR_NONE,8,   // SKINCOLOR_TAN
@@ -182,12 +182,12 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PURPLE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_MAGENTA
 	SKINCOLOR_BLUE,12,  // SKINCOLOR_ORANGE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_ROSEWOOD
+	SKINCOLOR_NONE,8,   // SKINCOLOR_RUST
 	SKINCOLOR_NONE,8,   // SKINCOLOR_BEIGE
 	SKINCOLOR_NONE,8,   // SKINCOLOR_BROWN
 	SKINCOLOR_GREEN,5,  // SKINCOLOR_RED
-	SKINCOLOR_NONE,8,   // SKINCOLOR_DARKRED
-	SKINCOLOR_NONE,8,   // SKINCOLOR_NEONGREEN
+	SKINCOLOR_NONE,8,   // SKINCOLOR_CRIMSON
+	SKINCOLOR_NONE,8,   // SKINCOLOR_EMERALD
 	SKINCOLOR_RED,11,   // SKINCOLOR_GREEN
 	SKINCOLOR_MAGENTA,3, // SKINCOLOR_ZIM
 	SKINCOLOR_NONE,8,   // SKINCOLOR_PERIDOT
@@ -243,9 +243,9 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x08, // SKINCOLOR_GREY
 		0x18, // SKINCOLOR_BLACK
 		0x70, // SKINCOLOR_CYAN
-		0xf8, // SKINCOLOR_AQUAMARINE
+		0xf8, // SKINCOLOR_AQUA
 		0x7c, // SKINCOLOR_TEAL
-		0x9a, // SKINCOLOR_STEELBLUE
+		0x9a, // SKINCOLOR_AZURE
 		0x82, // SKINCOLOR_BLUE
 		0xc8, // SKINCOLOR_PEACH
 		0x54, // SKINCOLOR_TAN
@@ -255,12 +255,12 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x90, // SKINCOLOR_PURPLE
 		0xa3, // SKINCOLOR_MAGENTA
 		0x31, // SKINCOLOR_ORANGE
-		0x3a, // SKINCOLOR_ROSEWOOD
+		0x3a, // SKINCOLOR_RUST
 		0xe0, // SKINCOLOR_BEIGE
 		0xd0, // SKINCOLOR_BROWN
 		0x21, // SKINCOLOR_RED
-		0x28, // SKINCOLOR_DARKRED
-		0xf0, // SKINCOLOR_NEONGREEN
+		0x28, // SKINCOLOR_CRIMSON
+		0xf0, // SKINCOLOR_EMERALD
 		0x60, // SKINCOLOR_GREEN
 		0x58, // SKINCOLOR_ZIM
 		0xac, // SKINCOLOR_PERIDOT
@@ -330,7 +330,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
-	case SKINCOLOR_AQUAMARINE:
+	case SKINCOLOR_AQUA:
 		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
@@ -354,7 +354,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_STEELBLUE:
+	case SKINCOLOR_AZURE:
 		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
@@ -458,7 +458,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_ROSEWOOD:
+	case SKINCOLOR_RUST:
 		// 9 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
@@ -496,7 +496,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_DARKRED:
+	case SKINCOLOR_CRIMSON:
 		// 9 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
@@ -509,7 +509,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_NEONGREEN:
+	case SKINCOLOR_EMERALD:
 		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 58992bea4..13cc36fe1 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -888,7 +888,7 @@ static void ST_drawFirstPersonHUD(void)
 
 // [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold
 static skincolors_t linkColor[14] =
-{SKINCOLOR_BEIGE,  SKINCOLOR_LAVENDER, SKINCOLOR_STEELBLUE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
+{SKINCOLOR_BEIGE,  SKINCOLOR_LAVENDER, SKINCOLOR_AZURE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
  SKINCOLOR_MAGENTA, SKINCOLOR_SILVER,   SKINCOLOR_SUPER4,    SKINCOLOR_PINK,  SKINCOLOR_RED,
  SKINCOLOR_BLUE,   SKINCOLOR_GREEN,    SKINCOLOR_CYAN,      SKINCOLOR_GOLD};
 
@@ -938,7 +938,7 @@ static void ST_drawNightsRecords(void)
 		V_DrawString(BASEVIDWIDTH/2 - 48, STRINGY(148), aflag, "BONUS:");
 		V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(140), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings));
 		V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(148), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings * 50));
-		ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_STEELBLUE);
+		ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_AZURE);
 
 		// If new record, say so!
 		if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1) <= stplyr->lastmarescore)
@@ -1220,7 +1220,7 @@ static void ST_drawNiGHTSHUD(void)
 #endif
 	)
 	{
-		ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_STEELBLUE);
+		ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_AZURE);
 	}
 
 	if (!stplyr->exiting

From 079f02ca69a4bbad6843a980594473fe74235eba Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Sat, 25 Jul 2015 14:10:52 +0100
Subject: [PATCH 10/15] Fix Peridot

---
 src/r_draw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 4f06a58a7..3518d384c 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -525,7 +525,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x48; // Lightest
+				dest_colormap[starttranscolor + i] = 0x58; // Lightest
 			else if (8*i/16 == 7)
 				dest_colormap[starttranscolor + i] = 0x6D; // Darkest
 			else if (8*i/16 >= 5)

From d0d19e684c1283d90acaa498556c1a26bebf6471 Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Fri, 21 Aug 2015 18:34:21 +0100
Subject: [PATCH 11/15] Change Lavender, Azure, Blue

---
 src/r_draw.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 3518d384c..8e046417e 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -324,6 +324,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 	case SKINCOLOR_WHITE:
 	case SKINCOLOR_BLACK:
 	case SKINCOLOR_PINK:
+	case SKINCOLOR_LAVENDER:
 	case SKINCOLOR_ZIM:
 		// 8 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
@@ -360,8 +361,6 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		{
 			if (8*i/16 <= 1)
 				dest_colormap[starttranscolor + i] = (UINT8)(0x80 + 8*i/16); // Lightest
-			else if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0x7B; // Darkest
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
 		}
@@ -371,7 +370,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (i == 14)
-				dest_colormap[starttranscolor + i] = 0x9F;
+				dest_colormap[starttranscolor + i] = 0xED;
 			else if (i == 15)
 				dest_colormap[starttranscolor + i] = 0x1F;
 			else
@@ -426,17 +425,6 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		}
 		break;
 
-	case SKINCOLOR_LAVENDER:
-		// 10 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = (UINT8)(0xEC + 10*i/16); // Lightest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
-		}
-		break;
-
 	case SKINCOLOR_PURPLE:
 		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)

From 5a033181b82b4a851e7942c0a1c8f207f1b4917b Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Fri, 21 Aug 2015 20:17:11 +0100
Subject: [PATCH 12/15] Metal Sonic Flash

---
 src/r_draw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 8e046417e..81bcc9438 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -283,7 +283,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		if (skinnum == TC_BOSS)
 			dest_colormap[31] = 0;
 		else if (skinnum == TC_METALSONIC)
-			dest_colormap[239] = 0;
+			dest_colormap[143] = 0;
 
 		return;
 	}

From 1ed54078215a2ab5b0618de25bee6007bf4c0c76 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sat, 7 Nov 2015 13:56:21 -0600
Subject: [PATCH 13/15] update stuff

---
 src/console.c          |  15 +-
 src/d_main.c           |   8 +-
 src/dehacked.c         |  40 +--
 src/doomdef.h          |  40 +--
 src/hardware/hw_defs.h |   5 +-
 src/m_menu.c           |   3 +-
 src/r_draw.c           | 570 +++++++++++++++++++----------------------
 src/r_draw8.c          |   3 +-
 8 files changed, 329 insertions(+), 355 deletions(-)

diff --git a/src/console.c b/src/console.c
index 1c8640396..fe447b10a 100644
--- a/src/console.c
+++ b/src/console.c
@@ -249,7 +249,7 @@ void CON_ReSetupBackColormap(UINT16 num)
 		j = pal[i] + pal[i+1] + pal[i+2];
 		cwhitemap[k] = (UINT8)(15 - (j>>6));
 		corangemap[k] = (UINT8)(63 - (j>>6));
-		cbluemap[k] = (UINT8)(143 - (j>>6));
+		cbluemap[k] = (UINT8)(159 - (j>>6));
 		cgreenmap[k] = (UINT8)(111 - (j>>6));
 		cgraymap[k] = (UINT8)(31 - (j>>6));
 		credmap[k] = (UINT8)(47 - (j>>6));
@@ -284,7 +284,7 @@ static void CON_SetupBackColormap(void)
 		j = pal[i] + pal[i+1] + pal[i+2];
 		cwhitemap[k] = (UINT8)(15 - (j>>6));
 		corangemap[k] = (UINT8)(63 - (j>>6));
-		cbluemap[k] = (UINT8)(143 - (j>>6));
+		cbluemap[k] = (UINT8)(159 - (j>>6));
 		cgreenmap[k] = (UINT8)(111 - (j>>6));
 		cgraymap[k] = (UINT8)(31 - (j>>6));
 		credmap[k] = (UINT8)(47 - (j>>6));
@@ -308,15 +308,15 @@ static void CON_SetupBackColormap(void)
 
 	yellowmap[3] = (UINT8)73;
 	yellowmap[9] = (UINT8)66;
-	purplemap[3] = (UINT8)168;
-	purplemap[9] = (UINT8)170;
+	purplemap[3] = (UINT8)184;
+	purplemap[9] = (UINT8)186;
 	lgreenmap[3] = (UINT8)102;
 	lgreenmap[9] = (UINT8)106;
-	bluemap[3]   = (UINT8)131;
-	bluemap[9]   = (UINT8)142;
+	bluemap[3]   = (UINT8)147;
+	bluemap[9]   = (UINT8)158;
 	graymap[3]   = (UINT8)10;
 	graymap[9]   = (UINT8)15;
-	redmap[3]    = (UINT8)194;
+	redmap[3]    = (UINT8)210;
 	redmap[9]    = (UINT8)32;
 	orangemap[3] = (UINT8)52;
 	orangemap[9] = (UINT8)57;
@@ -1472,3 +1472,4 @@ void CON_Drawer(void)
 	else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS)
 		CON_DrawHudlines();
 }
+
diff --git a/src/d_main.c b/src/d_main.c
index a959a8632..709cbea7b 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1121,10 +1121,10 @@ void D_SRB2Main(void)
 #if 1 // md5s last updated 12/14/14
 
 	// Check MD5s of autoloaded files
-	W_VerifyFileMD5(0, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad
-	W_VerifyFileMD5(1, ASSET_HASH_ZONES_DTA); // zones.dta
-	W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
-	W_VerifyFileMD5(3, ASSET_HASH_RINGS_DTA); // rings.dta
+	//W_VerifyFileMD5(0, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad
+	//W_VerifyFileMD5(1, ASSET_HASH_ZONES_DTA); // zones.dta
+	//W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
+	//W_VerifyFileMD5(3, ASSET_HASH_RINGS_DTA); // rings.dta
 	//W_VerifyFileMD5(4, "0c66790502e648bfce90fdc5bb15722e"); // patch.dta
 	// don't check music.dta because people like to modify it, and it doesn't matter if they do
 	// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
diff --git a/src/dehacked.c b/src/dehacked.c
index 760ae84b3..b22f7b867 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7309,30 +7309,31 @@ static const char *COLOR_ENUMS[] = {
 	"SILVER",   	// SKINCOLOR_SILVER
 	"GREY",	    	// SKINCOLOR_GREY
 	"BLACK",    	// SKINCOLOR_BLACK
-	"CYAN",     	// SKINCOLOR_CYAN
-	"AQUA",     	// SKINCOLOR_AQUA
-	"TEAL",     	// SKINCOLOR_TEAL
-	"AZURE",    	// SKINCOLOR_AZURE
-	"BLUE",     	// SKINCOLOR_BLUE
-	"PEACH",    	// SKINCOLOR_PEACH
-	"TAN",      	// SKINCOLOR_TAN
-	"PINK",     	// SKINCOLOR_PINK
-	"ROSY",     	// SKINCOLOR_ROSY
-	"LAVENDER", 	// SKINCOLOR_LAVENDER
-	"PURPLE",   	// SKINCOLOR_PURPLE
-	"MAGENTA",   	// SKINCOLOR_MAGENTA
-	"ORANGE",   	// SKINCOLOR_ORANGE
-	"RUST",     	// SKINCOLOR_RUST
 	"BEIGE",    	// SKINCOLOR_BEIGE
+	"PEACH",    	// SKINCOLOR_PEACH
 	"BROWN",    	// SKINCOLOR_BROWN
 	"RED",      	// SKINCOLOR_RED
 	"CRIMSON",     	// SKINCOLOR_CRIMSON
-	"EMERALD",  	// SKINCOLOR_EMERALD
-	"GREEN",    	// SKINCOLOR_GREEN
-	"ZIM",      	// SKINCOLOR_ZIM
-	"PERIDOT",    	// SKINCOLOR_PERIDOT
+	"ORANGE",   	// SKINCOLOR_ORANGE
+	"RUST",     	// SKINCOLOR_RUST
+	"GOLD",      	// SKINCOLOR_GOLD
 	"YELLOW",   	// SKINCOLOR_YELLOW
-	"GOLD"      	// SKINCOLOR_GOLD
+	"TAN",      	// SKINCOLOR_TAN
+	"MOSS",      	// SKINCOLOR_MOSS
+	"PERIDOT",    	// SKINCOLOR_PERIDOT
+	"GREEN",    	// SKINCOLOR_GREEN
+	"EMERALD",  	// SKINCOLOR_EMERALD
+	"AQUA",     	// SKINCOLOR_AQUA
+	"TEAL",     	// SKINCOLOR_TEAL
+	"CYAN",     	// SKINCOLOR_CYAN
+	"BLUE",     	// SKINCOLOR_BLUE
+	"AZURE",    	// SKINCOLOR_AZURE
+	"PASTEL",		// SKINCOLOR_PASTEL
+	"PURPLE",   	// SKINCOLOR_PURPLE
+	"LAVENDER", 	// SKINCOLOR_LAVENDER
+	"MAGENTA",   	// SKINCOLOR_MAGENTA
+	"PINK",     	// SKINCOLOR_PINK
+	"ROSY"     	// SKINCOLOR_ROSY
 };
 
 static const char *const POWERS_LIST[] = {
@@ -8769,3 +8770,4 @@ void LUA_SetActionByName(void *state, const char *actiontocompare)
 }
 
 #endif // HAVE_BLUA
+
diff --git a/src/doomdef.h b/src/doomdef.h
index d6af0f1a0..88fc206a2 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -230,30 +230,31 @@ typedef enum
 	SKINCOLOR_SILVER,
 	SKINCOLOR_GREY,
 	SKINCOLOR_BLACK,
-	SKINCOLOR_CYAN,
-	SKINCOLOR_AQUA,
-	SKINCOLOR_TEAL,
-	SKINCOLOR_AZURE,
-	SKINCOLOR_BLUE,
-	SKINCOLOR_PEACH,
-	SKINCOLOR_TAN,
-	SKINCOLOR_PINK,
-	SKINCOLOR_ROSY,
-	SKINCOLOR_LAVENDER,
-	SKINCOLOR_PURPLE,
-	SKINCOLOR_MAGENTA,
-	SKINCOLOR_ORANGE,
-	SKINCOLOR_RUST,
 	SKINCOLOR_BEIGE,
+	SKINCOLOR_PEACH,
 	SKINCOLOR_BROWN,
 	SKINCOLOR_RED,
 	SKINCOLOR_CRIMSON,
-	SKINCOLOR_EMERALD,
-	SKINCOLOR_GREEN,
-	SKINCOLOR_ZIM,
-	SKINCOLOR_PERIDOT,
-	SKINCOLOR_YELLOW,
+	SKINCOLOR_ORANGE,
+	SKINCOLOR_RUST,
 	SKINCOLOR_GOLD,
+	SKINCOLOR_YELLOW,
+	SKINCOLOR_TAN,
+	SKINCOLOR_MOSS,
+	SKINCOLOR_PERIDOT,
+	SKINCOLOR_GREEN,
+	SKINCOLOR_EMERALD,
+	SKINCOLOR_AQUA,
+	SKINCOLOR_TEAL,
+	SKINCOLOR_CYAN,
+	SKINCOLOR_BLUE,
+	SKINCOLOR_AZURE,
+	SKINCOLOR_PASTEL,
+	SKINCOLOR_PURPLE,
+	SKINCOLOR_LAVENDER,
+	SKINCOLOR_MAGENTA,
+	SKINCOLOR_PINK,
+	SKINCOLOR_ROSY,
 
 	// Careful! MAXSKINCOLORS cannot be greater than 0x20!
 	MAXSKINCOLORS,
@@ -498,3 +499,4 @@ extern const char *compdate, *comptime, *comprevision;
 //#define REDSANALOG
 
 #endif // __DOOMDEF__
+
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index 70d776d9e..5a39fead1 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -46,8 +46,8 @@ typedef unsigned char   FBOOLEAN;
 #define HWR_PATCHES_CHROMAKEY_COLORINDEX   0
 #define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 1
 #else
-#define HWR_PATCHES_CHROMAKEY_COLORINDEX   247
-#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 220
+#define HWR_PATCHES_CHROMAKEY_COLORINDEX   255
+#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 130
 #endif
 
 // the chroma key color shows on border sprites, set it to black
@@ -229,3 +229,4 @@ enum hwdfiltermode
 
 
 #endif //_HWR_DEFS_
+
diff --git a/src/m_menu.c b/src/m_menu.c
index 111be9479..f115e9d44 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2820,7 +2820,7 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv)
 void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
 {
 	// Solid color textbox.
-	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 143);
+	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 159);
 	//V_DrawFill(x+8, y+8, width*8, boxlines*8, 31);
 /*
 	patch_t *p;
@@ -7409,3 +7409,4 @@ static void M_HandleFogColor(INT32 choice)
 	}
 }
 #endif
+
diff --git a/src/r_draw.c b/src/r_draw.c
index 81bcc9438..420b96c1d 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -131,68 +131,70 @@ static UINT8** translationtablecache[MAXSKINS + 4] = {NULL};
 // TODO Callum: Can this be translated?
 const char *Color_Names[MAXSKINCOLORS] =
 {
-	"None",      // SKINCOLOR_NONE
-	"White",     // SKINCOLOR_WHITE
-	"Silver",    // SKINCOLOR_SILVER
-	"Grey",      // SKINCOLOR_GREY
-	"Black",     // SKINCOLOR_BLACK
-	"Cyan",      // SKINCOLOR_CYAN
-	"Aqua",      // SKINCOLOR_AQUAMARINE
-	"Teal",      // SKINCOLOR_TEAL
-	"Azure",     // SKINCOLOR_AZURE
-	"Blue",      // SKINCOLOR_BLUE
-	"Peach",     // SKINCOLOR_PEACH
-	"Tan",       // SKINCOLOR_TAN
-	"Pink",      // SKINCOLOR_PINK
-	"Rosy",      // SKINCOLOR_ROSY
-	"Lavender",  // SKINCOLOR_LAVENDER
-	"Purple",    // SKINCOLOR_PURPLE
-	"Magenta",   // SKINCOLOR_MAGENTA
-	"Orange",    // SKINCOLOR_ORANGE
-	"Rust",      // SKINCOLOR_RUST
-	"Beige",     // SKINCOLOR_BEIGE
-	"Brown",     // SKINCOLOR_BROWN
-	"Red",       // SKINCOLOR_RED
-	"Crimson",   // SKINCOLOR_CRIMSON
-	"Emerald",   // SKINCOLOR_EMERALD
-	"Green",     // SKINCOLOR_GREEN
-	"Zim",       // SKINCOLOR_ZIM
-	"Peridot",   // SKINCOLOR_PERIDOT
-	"Yellow",    // SKINCOLOR_YELLOW
-	"Gold"       // SKINCOLOR_GOLD
+	"None",     	// SKINCOLOR_NONE
+	"White",    	// SKINCOLOR_WHITE
+	"Silver",   	// SKINCOLOR_SILVER
+	"Grey",	    	// SKINCOLOR_GREY
+	"Black",    	// SKINCOLOR_BLACK
+	"Beige",    	// SKINCOLOR_BEIGE
+	"Peach",    	// SKINCOLOR_PEACH
+	"Brown",    	// SKINCOLOR_BROWN
+	"Red",      	// SKINCOLOR_RED
+	"Crimson",     	// SKINCOLOR_CRIMSON
+	"Orange",   	// SKINCOLOR_ORANGE
+	"Rust",     	// SKINCOLOR_RUST
+	"Gold",      	// SKINCOLOR_GOLD
+	"Yellow",   	// SKINCOLOR_YELLOW
+	"Tan",      	// SKINCOLOR_TAN
+	"Moss",      	// SKINCOLOR_MOSS
+	"Peridot",    	// SKINCOLOR_PERIDOT
+	"Green",    	// SKINCOLOR_GREEN
+	"Emerald",  	// SKINCOLOR_EMERALD
+	"Aqua",     	// SKINCOLOR_AQUA
+	"Teal",     	// SKINCOLOR_TEAL
+	"Cyan",     	// SKINCOLOR_CYAN
+	"Blue",     	// SKINCOLOR_BLUE
+	"Azure",    	// SKINCOLOR_AZURE
+	"Pastel",		// SKINCOLOR_PASTEL
+	"Purple",   	// SKINCOLOR_PURPLE
+	"Lavender", 	// SKINCOLOR_LAVENDER
+	"Magenta",   	// SKINCOLOR_MAGENTA
+	"Pink",     	// SKINCOLOR_PINK
+	"Rosy"     	// SKINCOLOR_ROSY
 };
 
 const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
 {
-	SKINCOLOR_NONE,8,   // SKINCOLOR_NONE
-	SKINCOLOR_BLACK,10, // SKINCOLOR_WHITE
-	SKINCOLOR_GREY,4,   // SKINCOLOR_SILVER
-	SKINCOLOR_SILVER,12,// SKINCOLOR_GREY
-	SKINCOLOR_WHITE,8,  // SKINCOLOR_BLACK
-	SKINCOLOR_NONE,8,   // SKINCOLOR_CYAN
-	SKINCOLOR_NONE,8,   // SKINCOLOR_AQUA
-	SKINCOLOR_NONE,8,   // SKINCOLOR_TEAL
-	SKINCOLOR_NONE,8,   // SKINCOLOR_AZURE
-	SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PEACH
-	SKINCOLOR_NONE,8,   // SKINCOLOR_TAN
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PINK
-	SKINCOLOR_NONE,8,   // SKINCOLOR_ROSY
-	SKINCOLOR_NONE,8,   // SKINCOLOR_LAVENDER
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PURPLE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_MAGENTA
-	SKINCOLOR_BLUE,12,  // SKINCOLOR_ORANGE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_RUST
-	SKINCOLOR_NONE,8,   // SKINCOLOR_BEIGE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_BROWN
-	SKINCOLOR_GREEN,5,  // SKINCOLOR_RED
-	SKINCOLOR_NONE,8,   // SKINCOLOR_CRIMSON
-	SKINCOLOR_NONE,8,   // SKINCOLOR_EMERALD
-	SKINCOLOR_RED,11,   // SKINCOLOR_GREEN
-	SKINCOLOR_MAGENTA,3, // SKINCOLOR_ZIM
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PERIDOT
-	SKINCOLOR_NONE,8,   // SKINCOLOR_YELLOW
-	SKINCOLOR_NONE,8    // SKINCOLOR_GOLD
+	SKINCOLOR_NONE,8,   	// SKINCOLOR_NONE
+	SKINCOLOR_BLACK,10, 	// SKINCOLOR_WHITE
+	SKINCOLOR_GREY,4,   	// SKINCOLOR_SILVER
+	SKINCOLOR_SILVER,12,	// SKINCOLOR_GREY
+	SKINCOLOR_WHITE,8,  	// SKINCOLOR_BLACK
+	SKINCOLOR_BEIGE,8,   	// SKINCOLOR_BEIGE - needs new offset
+	SKINCOLOR_BROWN,8,   	// SKINCOLOR_PEACH - ditto
+	SKINCOLOR_PEACH,8,   	// SKINCOLOR_BROWN - ditto
+	SKINCOLOR_GREEN,5,  	// SKINCOLOR_RED
+	SKINCOLOR_CYAN,8,   	// SKINCOLOR_CRIMSON - ditto
+	SKINCOLOR_BLUE,12,  	// SKINCOLOR_ORANGE
+	SKINCOLOR_TAN,8,   		// SKINCOLOR_RUST - ditto
+	SKINCOLOR_LAVENDER,8,    // SKINCOLOR_GOLD - ditto
+	SKINCOLOR_TEAL,8,   	// SKINCOLOR_YELLOW - ditto
+	SKINCOLOR_RUST,8,   	// SKINCOLOR_TAN - ditto
+	SKINCOLOR_MAGENTA,3, 	// SKINCOLOR_MOSS
+	SKINCOLOR_PURPLE,8,   	// SKINCOLOR_PERIDOT - ditto
+	SKINCOLOR_RED,11,   	// SKINCOLOR_GREEN
+	SKINCOLOR_PASTEL,8,   	// SKINCOLOR_EMERALD - ditto
+	SKINCOLOR_ROSY,8,   	// SKINCOLOR_AQUA - ditto
+	SKINCOLOR_YELLOW,8,   	// SKINCOLOR_TEAL - ditto
+	SKINCOLOR_CRIMSON,8,   	// SKINCOLOR_CYAN - ditto
+	SKINCOLOR_ORANGE,9, 	// SKINCOLOR_BLUE
+	SKINCOLOR_PINK,8,   	// SKINCOLOR_AZURE - ditto
+	SKINCOLOR_EMERALD,8,   	// SKINCOLOR_PASTEL - ditto
+	SKINCOLOR_PERIDOT,8,   	// SKINCOLOR_PURPLE - ditto
+	SKINCOLOR_GOLD,8,   	// SKINCOLOR_LAVENDER - ditto
+	SKINCOLOR_MOSS,8,   	// SKINCOLOR_MAGENTA - ditto
+	SKINCOLOR_AZURE,8,   	// SKINCOLOR_PINK - ditto
+	SKINCOLOR_AQUA,8   	// SKINCOLOR_ROSY - ditto
 };
 
 CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
@@ -242,30 +244,31 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		0x03, // SKINCOLOR_SILVER
 		0x08, // SKINCOLOR_GREY
 		0x18, // SKINCOLOR_BLACK
-		0x70, // SKINCOLOR_CYAN
-		0xf8, // SKINCOLOR_AQUA
-		0x7c, // SKINCOLOR_TEAL
-		0x9a, // SKINCOLOR_AZURE
-		0x82, // SKINCOLOR_BLUE
-		0xc8, // SKINCOLOR_PEACH
-		0x54, // SKINCOLOR_TAN
-		0xc0, // SKINCOLOR_PINK
-		0xb8, // SKINCOLOR_ROSY
-		0xb0, // SKINCOLOR_LAVENDER
-		0x90, // SKINCOLOR_PURPLE
-		0xa3, // SKINCOLOR_MAGENTA
-		0x31, // SKINCOLOR_ORANGE
-		0x3a, // SKINCOLOR_RUST
-		0xe0, // SKINCOLOR_BEIGE
-		0xd0, // SKINCOLOR_BROWN
+		0xf0, // SKINCOLOR_BEIGE
+		0xd8, // SKINCOLOR_PEACH
+		0xe0, // SKINCOLOR_BROWN
 		0x21, // SKINCOLOR_RED
 		0x28, // SKINCOLOR_CRIMSON
-		0xf0, // SKINCOLOR_EMERALD
-		0x60, // SKINCOLOR_GREEN
-		0x58, // SKINCOLOR_ZIM
-		0xac, // SKINCOLOR_PERIDOT
-		0x48, // SKINCOLOR_YELLOW
+		0x31, // SKINCOLOR_ORANGE
+		0x3a, // SKINCOLOR_RUST
 		0x40, // SKINCOLOR_GOLD
+		0x48, // SKINCOLOR_YELLOW
+		0x54, // SKINCOLOR_TAN
+		0x58, // SKINCOLOR_MOSS
+		0xbc, // SKINCOLOR_PERIDOT
+		0x60, // SKINCOLOR_GREEN
+		0x70, // SKINCOLOR_EMERALD
+		0x78, // SKINCOLOR_AQUA
+		0x8c, // SKINCOLOR_TEAL
+		0x80, // SKINCOLOR_CYAN
+		0x92, // SKINCOLOR_BLUE
+		0xaa, // SKINCOLOR_AZURE
+		0xa0, // SKINCOLOR_PASTEL
+		0xa0, // SKINCOLOR_PURPLE
+		0xc0, // SKINCOLOR_LAVENDER
+		0xb3, // SKINCOLOR_MAGENTA
+		0xd0, // SKINCOLOR_PINK
+		0xc8, // SKINCOLOR_ROSY
 	};
 	INT32 i;
 	INT32 starttranscolor;
@@ -283,7 +286,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		if (skinnum == TC_BOSS)
 			dest_colormap[31] = 0;
 		else if (skinnum == TC_METALSONIC)
-			dest_colormap[143] = 0;
+			dest_colormap[159] = 0;
 
 		return;
 	}
@@ -309,176 +312,59 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		break;
 
+	case SKINCOLOR_WHITE:
 	case SKINCOLOR_CYAN:
 		// 12 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (12*i/SKIN_RAMP_LENGTH));
 		break;
 
-	case SKINCOLOR_MAGENTA:
-		// 9 color ramp
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
-		break;
-
-	case SKINCOLOR_WHITE:
 	case SKINCOLOR_BLACK:
-	case SKINCOLOR_PINK:
+	case SKINCOLOR_MOSS:
+	case SKINCOLOR_EMERALD:
 	case SKINCOLOR_LAVENDER:
-	case SKINCOLOR_ZIM:
+	case SKINCOLOR_PINK:
 		// 8 color ramp
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		break;
 
-	case SKINCOLOR_AQUA:
-		// 10 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (10*i/16 >= 8)
-				dest_colormap[starttranscolor + i] = (UINT8)(0x6C + (10*i/SKIN_RAMP_LENGTH) - 8); // Darkest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH));
-		}
-		break;
-
-	case SKINCOLOR_TEAL:
-		// 6 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (6*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xf8; // Lightest
-			else if (6*i/16 == 5)
-				dest_colormap[starttranscolor + i] = 0x7a; // Darkest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (6*i/SKIN_RAMP_LENGTH) - 1);
-		}
-		break;
-
-	case SKINCOLOR_AZURE:
-		// 8 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (8*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = (UINT8)(0x80 + 8*i/16); // Lightest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
-		}
-		break;
-
-	case SKINCOLOR_BLUE:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (i == 14)
-				dest_colormap[starttranscolor + i] = 0xED;
-			else if (i == 15)
-				dest_colormap[starttranscolor + i] = 0x1F;
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
-		}
-		break;
-
-	case SKINCOLOR_PEACH:
-		// 10 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (10*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xC0; // Lightest
-			else if (10*i/16 == 1)
-				dest_colormap[starttranscolor + i] = 0x30; // Second
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
-		}
-		break;
-
-	case SKINCOLOR_TAN:
-		// 8 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (8*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x51; // Lightest 1
-			else if (8*i/16 == 5)
-				dest_colormap[starttranscolor + i] = 0xE5; // Darkest 1
-			else if (8*i/16 == 6)
-				dest_colormap[starttranscolor + i] = 0xE9; // Darkest 2
-			else if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0xDD; // Darkest 3
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
-		}
-		break;
-
-	case SKINCOLOR_ROSY:
-		// 15 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (15*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0xEC; // Lightest
-			else if (15*i/16 == 12)
-				dest_colormap[starttranscolor + i] = 0x47; // Dark Shade
-			else if (15*i/16 >= 13)
-				dest_colormap[starttranscolor + i] = (UINT8)(0x2E + (15*i/SKIN_RAMP_LENGTH) - 13); // Darkest
-			else if (15*i/16 >= 9)
-				dest_colormap[starttranscolor + i] = (UINT8)(0x2B + (15*i/SKIN_RAMP_LENGTH) - 9); // Darkish
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (15*i/SKIN_RAMP_LENGTH) - 1); // main
-		}
-		break;
-
-	case SKINCOLOR_PURPLE:
-		// 10 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (i <= 3)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i); // Lightest
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) + 2); // main
-		}
-		break;
-
-	case SKINCOLOR_ORANGE:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (i == 15)
-				dest_colormap[starttranscolor + i] = 0xEE;
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
-		}
-		break;
-
-	case SKINCOLOR_RUST:
-		// 9 colors
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-		{
-			if (9*i/16 == 6)
-				dest_colormap[starttranscolor + i] = 0xEE;
-			else if (9*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0xEF;
-			else if (9*i/16 == 8)
-				dest_colormap[starttranscolor + i] = 0x47;
-			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
-		}
-		break;
-
 	case SKINCOLOR_BEIGE:
 		// 13 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (13*i/16 == 12)
-				dest_colormap[starttranscolor + i] = 0xDD; // darkest
+			if (i == 15)
+				dest_colormap[starttranscolor + i] = 0xed; // Darkest
+			else if (i <= 6)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + ((i + 1) >> 1)); // Brightest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (13*i/SKIN_RAMP_LENGTH)); // Neon green
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 3);
 		}
 		break;
-
+		
+	case SKINCOLOR_PEACH:
+		// 11 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = 0xD0; // Lightest 1
+			else if (i == 1)
+				dest_colormap[starttranscolor + i] = 0x30; // Lightest 2
+			else if (i <= 11)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 1);
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 7); // Darkest
+		}
+		break;
+		
 	case SKINCOLOR_RED:
+		// 16 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (i == 13)
-				dest_colormap[starttranscolor + i] = 0x47;
+				dest_colormap[starttranscolor + i] = 0x47; // Semidark
 			else if (i > 13)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 1);
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 1); // Darkest
 			else
 				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		}
@@ -488,38 +374,52 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		// 9 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (9*i/16 == 6)
-				dest_colormap[starttranscolor + i] = 0x47;
-			else if (9*i/16 > 6)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH) - 1);
+			if (i/2 == 6)
+				dest_colormap[starttranscolor + i] = 0x47; // Semidark
+			else if (i/2 == 7)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 8); // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (9*i/SKIN_RAMP_LENGTH));
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		}
 		break;
 
-	case SKINCOLOR_EMERALD:
-		// 8 colors
+	case SKINCOLOR_ORANGE:
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0x6E; // Darkest
+			if (i == 15)
+				dest_colormap[starttranscolor + i] = 0x2c; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH)); // Neon green
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
 		}
 		break;
 
-	case SKINCOLOR_PERIDOT:
-		// 8 colors
+	case SKINCOLOR_RUST:
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (8*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x58; // Lightest
-			else if (8*i/16 == 7)
-				dest_colormap[starttranscolor + i] = 0x6D; // Darkest
-			else if (8*i/16 >= 5)
-				dest_colormap[starttranscolor + i] = (UINT8)(0x5E + (8*i/SKIN_RAMP_LENGTH) - 5); // Darkish
+			if (i <= 11)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
+			else if (i == 12)
+				dest_colormap[starttranscolor + i] = 0x2c; // Darkest 4
+			else if (i == 13)
+				dest_colormap[starttranscolor + i] = 0xfe; // Darkest 3
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 1); // main
+				dest_colormap[starttranscolor + i] = 0x2d + i - 14; // Darkest 2 and 1
+		}
+		break;
+
+	case SKINCOLOR_GOLD:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = 0x50; // Lightest 1
+			else if (i == 1)
+				dest_colormap[starttranscolor + i] = 0x53; // Lightest 2
+			else if (i/2 == 7)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 8); //Darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 1);
 		}
 		break;
 
@@ -530,22 +430,135 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 			if (i == 0)
 				dest_colormap[starttranscolor + i] = 0x53; // Lightest
 			else if (i == 15)
-				dest_colormap[starttranscolor + i] = 0xDD; // Darkest
+				dest_colormap[starttranscolor + i] = 0xed; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH));
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
 		}
 		break;
 
-	case SKINCOLOR_GOLD:
+	case SKINCOLOR_TAN:
+		// 8 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i/2 == 0)
+				dest_colormap[starttranscolor + i] = 0x51; // Lightest
+			else if (i/2 == 5)
+				dest_colormap[starttranscolor + i] = 0xf5; // Darkest 1
+			else if (i/2 == 6)
+				dest_colormap[starttranscolor + i] = 0xf9; // Darkest 2
+			else if (i/2 == 7)
+				dest_colormap[starttranscolor + i] = 0xed; // Darkest 3
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 1);
+		}
+		break;
+
+	case SKINCOLOR_PERIDOT:
+		// 8 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i/2 == 0)
+				dest_colormap[starttranscolor + i] = 0x58; // Lightest
+			else if (i/2 == 7)
+				dest_colormap[starttranscolor + i] = 0x77; // Darkest
+			else if (i/2 >= 5)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x5e + (i >> 1) - 5); // Semidark
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 1);
+		}
+		break;
+
+	case SKINCOLOR_AQUA:
 		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 == 0)
-				dest_colormap[starttranscolor + i] = 0x50; // Lightest
-			else if (10*i/16 == 1)
-				dest_colormap[starttranscolor + i] = 0x53; // Second
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = 0x78; // Lightest
+			else if (i >= 14)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x76 + i - 14); // Darkest
 			else
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) + 1);
+		}
+		break;
+
+	case SKINCOLOR_TEAL:
+		// 6 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i <= 1)
+				dest_colormap[starttranscolor + i] = 0x78; // Lightest
+			else if (i >= 13)
+				dest_colormap[starttranscolor + i] = 0x8a; // Darkest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + ((i - 1)/3));
+		}
+		break;
+
+	case SKINCOLOR_AZURE:
+		// 8 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i <= 3)
+				dest_colormap[starttranscolor + i] = (UINT8)(0x90 + i/2); // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 2);
+		}
+		break;
+
+	case SKINCOLOR_BLUE:
+		// 16 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 15)
+				dest_colormap[starttranscolor + i] = 0x1F; //Darkest 1
+			else if (i == 14)
+				dest_colormap[starttranscolor + i] = 0xfd; //Darkest 2
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i);
+		}
+		break;
+
+	case SKINCOLOR_PASTEL:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i >= 12)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i - 7); // Darkest
+			else if (i <= 1)
+				dest_colormap[starttranscolor + i] = 0x90; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) - 1);
+		}
+		break;
+
+	case SKINCOLOR_PURPLE:
+		// 10 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i <= 3)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + i); // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) + 2);
+		}
+		break;
+
+	case SKINCOLOR_MAGENTA:
+		// 9 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1]); // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1) + 1);
+		break;
+
+	case SKINCOLOR_ROSY:
+		// 9 colors
+		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
+		{
+			if (i == 0)
+				dest_colormap[starttranscolor + i] = 0xfc; // Lightest
+			else
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + ((i - 1) >> 1));
 		}
 		break;
 
@@ -612,67 +625,19 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		dest_colormap[starttranscolor + 15] = (UINT8)63;
 		break;
 
-	// Super Tails
+	// Super Tails and Knuckles, who really should be dummied out by now
 	case SKINCOLOR_TSUPER1:
-		for (i = 0; i < 10; i++) // white
-			dest_colormap[starttranscolor + i] = 120;
-		for (; i < SKIN_RAMP_LENGTH; i++) // orange
-			dest_colormap[starttranscolor + i] = (UINT8)(80 + (i-10));
-		break;
-
 	case SKINCOLOR_TSUPER2:
-		for (i = 0; i < 4; i++) // white
-			dest_colormap[starttranscolor + i] = 120;
-		for (; i < SKIN_RAMP_LENGTH; i++) // orange
-			dest_colormap[starttranscolor + i] = (UINT8)(80 + ((i-4)>>1));
-		break;
-
 	case SKINCOLOR_TSUPER3:
-		dest_colormap[starttranscolor] = 120; // pure white
-		dest_colormap[starttranscolor+1] = 120;
-		for (i = 2; i < SKIN_RAMP_LENGTH; i++) // orange
-			dest_colormap[starttranscolor + i] = (UINT8)(80 + ((i-2)>>1));
-		break;
-
 	case SKINCOLOR_TSUPER4:
-		dest_colormap[starttranscolor] = 120; // pure white
-		for (i = 1; i < 9; i++) // orange
-			dest_colormap[starttranscolor + i] = (UINT8)(80 + (i-1));
-		for (; i < SKIN_RAMP_LENGTH; i++) // gold
-			dest_colormap[starttranscolor + i] = (UINT8)(115 + (5*(i-9)/7));
-		break;
-
 	case SKINCOLOR_TSUPER5:
-		for (i = 0; i < 8; i++) // orange
-			dest_colormap[starttranscolor + i] = (UINT8)(80 + i);
-		for (; i < SKIN_RAMP_LENGTH; i++) // gold
-			dest_colormap[starttranscolor + i] = (UINT8)(115 + (5*(i-8)/8));
-		break;
-
-	// Super Knuckles
 	case SKINCOLOR_KSUPER1:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(120 + (i >> 2));
-		break;
-
 	case SKINCOLOR_KSUPER2:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(120 + (6*i/SKIN_RAMP_LENGTH));
-		break;
-
 	case SKINCOLOR_KSUPER3:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(120 + (i >> 1));
-		break;
-
 	case SKINCOLOR_KSUPER4:
-		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(121 + (i >> 1));
-		break;
-
 	case SKINCOLOR_KSUPER5:
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
-			dest_colormap[starttranscolor + i] = (UINT8)(122 + (i >> 1));
+			dest_colormap[starttranscolor + i] = 0xFF;
 		break;
 
 	default:
@@ -986,3 +951,4 @@ void R_DrawViewBorder(void)
 // ==========================================================================
 
 #include "r_draw16.c"
+
diff --git a/src/r_draw8.c b/src/r_draw8.c
index e0264ba92..d6c109574 100644
--- a/src/r_draw8.c
+++ b/src/r_draw8.c
@@ -105,7 +105,7 @@ void R_DrawColumn_8(void)
 	}
 }
 
-#define TRANSPARENTPIXEL 247
+#define TRANSPARENTPIXEL 255
 
 void R_Draw2sMultiPatchColumn_8(void)
 {
@@ -947,3 +947,4 @@ void R_DrawColumnShadowed_8(void)
 	if (dc_yl <= realyh)
 		walldrawerfunc();		// R_DrawWallColumn_8 for the appropriate architecture
 }
+

From 5409367a5f56434cf9fe0ada86958a492a29e4db Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sat, 7 Nov 2015 15:32:11 -0600
Subject: [PATCH 14/15] Define TRANSPARENTPIXEL as 255 in asm files

---
 src/tmap.nas     | 2 +-
 src/tmap_mmx.nas | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tmap.nas b/src/tmap.nas
index 6d1629c20..dbe64806d 100644
--- a/src/tmap.nas
+++ b/src/tmap.nas
@@ -17,7 +17,7 @@
 [BITS 32]
 
 %define FRACBITS 16
-%define TRANSPARENTPIXEL 247
+%define TRANSPARENTPIXEL 255
 
 %ifdef LINUX
 %macro cextern 1
diff --git a/src/tmap_mmx.nas b/src/tmap_mmx.nas
index 928916668..758cd4395 100644
--- a/src/tmap_mmx.nas
+++ b/src/tmap_mmx.nas
@@ -18,7 +18,7 @@
 [BITS 32]
 
 %define FRACBITS 16
-%define TRANSPARENTPIXEL 247
+%define TRANSPARENTPIXEL 255
 
 %ifdef LINUX
 %macro cextern 1

From 2b6e65f122b00528eb9fd11222ee6ef2d5ac7795 Mon Sep 17 00:00:00 2001
From: Yukita Mayako <catgirl@goddess.moe>
Date: Mon, 9 Nov 2015 16:45:35 -0500
Subject: [PATCH 15/15] Added missing comma to COLOR_ENUMS string array after
 "ROSY".

It's not SKINCOLOR_ROSYSUPER1, after all.
---
 src/dehacked.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 6905d8379..d5b808e35 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7337,7 +7337,7 @@ static const char *COLOR_ENUMS[] = {
 	"LAVENDER", 	// SKINCOLOR_LAVENDER
 	"MAGENTA",   	// SKINCOLOR_MAGENTA
 	"PINK",     	// SKINCOLOR_PINK
-	"ROSY"     	// SKINCOLOR_ROSY
+	"ROSY",     	// SKINCOLOR_ROSY
 	// Super special awesome Super flashing colors!
 	"SUPER1",   	// SKINCOLOR_SUPER1
 	"SUPER2",   	// SKINCOLOR_SUPER2,