From 46e68d02c5a3dd2e1605e4c1cd62c815d4f29e24 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Thu, 16 Aug 2018 14:37:43 -0700
Subject: [PATCH] Merged assistantArt and AssistantArtRendered and fixed
 pathing for rendered art

---
 .gitignore                                    |    6 +
 devNotes/twine JS.txt                         |   71 +-
 src/art/artJS.tw                              | 2809 +++++++++--------
 src/art/artWidgets.tw                         |   44 -
 src/pregmod/assistantAppearancePackTwo.tw     |    2 +-
 src/uncategorized/RESS.tw                     |    2 +-
 src/uncategorized/assistantEvents.tw          |    2 +-
 src/uncategorized/personalAssistantOptions.tw |    2 +-
 8 files changed, 1491 insertions(+), 1447 deletions(-)

diff --git a/.gitignore b/.gitignore
index 817ab165426..682af84492c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,9 @@ ENV/
 
 # Start.tw 
 src/config/start.tw 
+
+# eslint
+.eslintrc.js
+node_modules
+package-lock.json
+package.json
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index a9202c1c4a3..06b1a8ffbac 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -23298,36 +23298,71 @@ sizePlacement: Image size/center.
 	3: Large, right. Example: description.
 	2: Medium, right. Example: random events.
 */
-window.AssistantArtRendered = function AssistantArtRendered(sizePlacement) {
+window.assistantArt = function assistantArt(sizePlacement) {
 	const V = State.variables;
-	let fileName = "";
+	let fileName = "'";
 
-	if (V.imageChoice === 0) {
+	if (V.imageChoice === 0 || V.imageChoice === 1) {
+		if (V.imageChoice === 1) {
+			fileName += "resources/vector/avatar/";
+		} else /* V.imageChoice === 0*/ {
+			fileName += "resources/renders/assistant ";
+		}
 		switch (V.assistantAppearance) {
 			case "monstergirl":
-				fileName = "'resources/renders/assistant monstergirl.png'";
+				fileName += "monstergirl.png'";
 				break;
 			case "shemale":
-				fileName = "'resources/renders/assistant shemale.png'";
+				fileName += "shemale.png'";
 				break;
 			case "amazon":
-				fileName = "'resources/renders/assistant amazon.png'";
+				fileName += "amazon.png'";
 				break;
 			case "businesswoman":
-				fileName = "'resources/renders/assistant businesswoman.png'";
+				fileName += "businesswoman.png'";
 				break;
 			case "goddess":
-				fileName = "'resources/renders/assistant goddess.png'";
+				fileName += "goddess.png'";
 				break;
 			case "schoolgirl":
-				fileName = "'resources/renders/assistant schoolgirl.png'";
+				fileName += "schoolgirl.png'";
+				break;
+			case "angel":
+				fileName += "angel.png'";
+				break;
+			case "cherub":
+				fileName += "cherub.png'";
+				break;
+			case "ERROR_1606_APPEARANCE_FILE_CORRUPT":
+				fileName += "corrupt.png'";
+				break;
+			case "fairy":
+				fileName += "fairy.png'";
+				break;
+			case "imp":
+				fileName += "imp.png'";
+				break;
+			case "incubus":
+				fileName += "incubus.png'";
+				break;
+			case "pregnant fairy":
+				fileName += "pfairy.png'";
+				break;
+			case "succubus":
+				fileName += "succubus.png'";
+				break;
+			case "witch":
+				fileName += "witch.png'";
 				break;
 			default:
-				fileName = "'resources/renders/assistant default.png'";
+				fileName += "default.png'";
 		}
+
 		if (sizePlacement === 3) {
 			fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
-		} else {
+		} else if (V.imageChoice === 1) {
+			fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
+		} else /* V.imageChoice === 0 */ {
 			fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
 		}
 	}
@@ -23336,24 +23371,24 @@ window.AssistantArtRendered = function AssistantArtRendered(sizePlacement) {
 
 window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
 	const V = State.variables;
-	let fileName = "";
+	let fileName = "'resources/renders/";
 	let r = "";
 
 	if (slave.vagina > -1) {
 		if (slave.dick > 0) {
 			if (slave.balls > 0) {
-				fileName = "futanari";
+				fileName += "futanari";
 			} else {
-				fileName = "herm";
+				fileName += "herm";
 			}
 		} else {
-			fileName = "female";
+			fileName += "female";
 		}
 	} else {
 		if (slave.balls > 0) {
-			fileName = "shemale";
+			fileName += "shemale";
 		} else {
-			fileName = "gelding";
+			fileName += "gelding";
 		}
 	}
 	if (slave.belly > 1500) {
@@ -23393,7 +23428,7 @@ window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
 		}
 	}
 
-	fileName = `'resources/renders/${fileName}.png'`;
+	fileName += ".png'";
 	if (sizePlacement === 3) {
 		r = `<img src=${fileName} style='float:right; border:3px hidden'>`;
 	} else if (sizePlacement === 2) {
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index ded46ab4da2..f0a1dcfaa6d 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -6,36 +6,71 @@ sizePlacement: Image size/center.
 	3: Large, right. Example: description.
 	2: Medium, right. Example: random events.
 */
-window.AssistantArtRendered = function AssistantArtRendered(sizePlacement) {
+window.assistantArt = function assistantArt(sizePlacement) {
 	const V = State.variables;
-	let fileName = "";
+	let fileName = "'";
 
-	if (V.imageChoice === 0) {
+	if (V.imageChoice === 0 || V.imageChoice === 1) {
+		if (V.imageChoice === 1) {
+			fileName += "resources/vector/avatar/";
+		} else /* V.imageChoice === 0*/ {
+			fileName += "resources/renders/assistant ";
+		}
 		switch (V.assistantAppearance) {
 			case "monstergirl":
-				fileName = "'resources/renders/assistant monstergirl.png'";
+				fileName += "monstergirl.png'";
 				break;
 			case "shemale":
-				fileName = "'resources/renders/assistant shemale.png'";
+				fileName += "shemale.png'";
 				break;
 			case "amazon":
-				fileName = "'resources/renders/assistant amazon.png'";
+				fileName += "amazon.png'";
 				break;
 			case "businesswoman":
-				fileName = "'resources/renders/assistant businesswoman.png'";
+				fileName += "businesswoman.png'";
 				break;
 			case "goddess":
-				fileName = "'resources/renders/assistant goddess.png'";
+				fileName += "goddess.png'";
 				break;
 			case "schoolgirl":
-				fileName = "'resources/renders/assistant schoolgirl.png'";
+				fileName += "schoolgirl.png'";
+				break;
+			case "angel":
+				fileName += "angel.png'";
+				break;
+			case "cherub":
+				fileName += "cherub.png'";
+				break;
+			case "ERROR_1606_APPEARANCE_FILE_CORRUPT":
+				fileName += "corrupt.png'";
+				break;
+			case "fairy":
+				fileName += "fairy.png'";
+				break;
+			case "imp":
+				fileName += "imp.png'";
+				break;
+			case "incubus":
+				fileName += "incubus.png'";
+				break;
+			case "pregnant fairy":
+				fileName += "pfairy.png'";
+				break;
+			case "succubus":
+				fileName += "succubus.png'";
+				break;
+			case "witch":
+				fileName += "witch.png'";
 				break;
 			default:
-				fileName = "'resources/renders/assistant default.png'";
+				fileName += "default.png'";
 		}
+
 		if (sizePlacement === 3) {
 			fileName = `<img src=${fileName} style='float:right; border:3px hidden'/>`;
-		} else {
+		} else if (V.imageChoice === 1) {
+			fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='282' height='602'/>`;
+		} else /* V.imageChoice === 0 */ {
 			fileName = `<img src=${fileName} style='float:right; border:3px hidden' width='300' height='300'/>`;
 		}
 	}
@@ -44,24 +79,24 @@ window.AssistantArtRendered = function AssistantArtRendered(sizePlacement) {
 
 window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
 	const V = State.variables;
-	let fileName = "";
+	let fileName = "'resources/renders/";
 	let r = "";
 
 	if (slave.vagina > -1) {
 		if (slave.dick > 0) {
 			if (slave.balls > 0) {
-				fileName = "futanari";
+				fileName += "futanari";
 			} else {
-				fileName = "herm";
+				fileName += "herm";
 			}
 		} else {
-			fileName = "female";
+			fileName += "female";
 		}
 	} else {
 		if (slave.balls > 0) {
-			fileName = "shemale";
+			fileName += "shemale";
 		} else {
-			fileName = "gelding";
+			fileName += "gelding";
 		}
 	}
 	if (slave.belly > 1500) {
@@ -101,7 +136,7 @@ window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
 		}
 	}
 
-	fileName = `'resources/renders/${fileName}.png'`;
+	fileName += ".png'";
 	if (sizePlacement === 3) {
 		r = `<img src=${fileName} style='float:right; border:3px hidden'>`;
 	} else if (sizePlacement === 2) {
@@ -121,7 +156,7 @@ hColor should be a color name, but can also be a string describing hair colour.
 
 This code's working is described to the user in the Encyclopedia, chapter "Lore", section "Dyes".
 */
-window.extractHairColor = function(hColor) {
+window.extractHairColor = function (hColor) {
 	/* 
 	these are color names known and used in FreeCities 
 	attributed color names are at the front of the array
@@ -169,17 +204,17 @@ window.extractHairColor = function(hColor) {
 		["brunette", "#8D4F21"],
 		["dark", "#463325"]
 	];
-	
+
 	/* these are HTML color names supported by most browsers */
-	var HTMLstandardColors = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgrey","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgrey","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-	
+	var HTMLstandardColors = ["aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray", "darkgrey", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet", "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew", "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender", "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgrey", "lightgreen", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered", "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan", "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white", "whitesmoke", "yellow", "yellowgreen"];
+
 	var FCnames = new Map(FCname2HTMLarray);
 	hColor = hColor.toLowerCase(); /* normalization: lowercase color name */
 	var colorCode = FCnames.get(hColor); /* look up in FreeCities color names */
 	if (!colorCode) { /* not a FreeCities color name*/
 		if (HTMLstandardColors.includes(hColor) || hColor.match(/^#([0-9a-f]{3}){1,2}$/) !== null) {
 			colorCode = hColor; /* is a HTML color name or value, use it directly */
-		} else { 
+		} else {
 			/* 
 			is not even a HTML color name. hColor probably is a description.
 			look for anything resembling a valid color name within the description.
@@ -187,1384 +222,1396 @@ window.extractHairColor = function(hColor) {
 			var hColorNoSpaces = hColor.replace(/\s+/g, ''); /* remove all spaces from description */
 			var FCkeys = Array.from(FCnames.keys());
 			var colorCodes = [
-				FCnames.get(FCkeys.find(function (e){return hColor.startsWith(e);})),
-				HTMLstandardColors.find(function (e){return hColorNoSpaces.startsWith(e);}),
-				FCnames.get(FCkeys.find(function (e){return hColor.includes(e);})),
-				HTMLstandardColors.find(function (e){return hColorNoSpaces.includes(e);})
+				FCnames.get(FCkeys.find(function (e) {
+					return hColor.startsWith(e);
+				})),
+				HTMLstandardColors.find(function (e) {
+					return hColorNoSpaces.startsWith(e);
+				}),
+				FCnames.get(FCkeys.find(function (e) {
+					return hColor.includes(e);
+				})),
+				HTMLstandardColors.find(function (e) {
+					return hColorNoSpaces.includes(e);
+				})
 			];
-			colorCode = colorCodes.find(function (e){return e;}); /* picks the first successful guess */
+			colorCode = colorCodes.find(function (e) {
+				return e;
+			}); /* picks the first successful guess */
 		}
 	}
 	if (!colorCode) {
-		console.log("Art Color Tools JS: Unable to determine HTML compliant color code for hair color string '"+hColor+"'.");
+		console.log("Art Color Tools JS: Unable to determine HTML compliant color code for hair color string '" + hColor + "'.");
 		colorCode = "fuchsia"; /* use fuchsia as error marker */
 	}
 	return colorCode;
 };
 
-window.clothing2artSuffix = function(v) {
-  if (v == "restrictive latex") { v = "latex"; } /* universal "special case": latex art is actually "restrictive latex" TODO: align name in vector source */
-  return v.replace(/^a[n]? /,"") /* remove "a" and "an" from the beginning*/
-		  .replace(/ ?(outfit|clothing) ?/,"") /* remove "outfit" and "clothing" (redundant) */
-		  .replace(/ and .+/,"") /* remove concatenated descriptions */
-		  .replace(/\w\S*/g, 
-			function(txt){
-				return txt.charAt(0).toUpperCase() + 
-					   txt.substr(1).toLowerCase();
+window.clothing2artSuffix = function (v) {
+	if (v == "restrictive latex") {
+		v = "latex";
+	} /* universal "special case": latex art is actually "restrictive latex" TODO: align name in vector source */
+	return v.replace(/^a[n]? /, "") /* remove "a" and "an" from the beginning*/
+		.replace(/ ?(outfit|clothing) ?/, "") /* remove "outfit" and "clothing" (redundant) */
+		.replace(/ and .+/, "") /* remove concatenated descriptions */
+		.replace(/\w\S*/g,
+			function (txt) {
+				return txt.charAt(0).toUpperCase() +
+					txt.substr(1).toLowerCase();
 			}
-		  ) /* CamelCase by whitespace */
-		  .replace(/\W/g,""); /* remove remaining whitespace */
+		) /* CamelCase by whitespace */
+		.replace(/\W/g, ""); /* remove remaining whitespace */
 };
 
-window.skinColorCatcher = function(artSlave) {
-var colorSlave = {
-   skinColor: "#e8b693;",
-   areolaColor: "#d76b93;",
-   labiaColor: "#d76b93;",
-   lipsColor: "#ff69b4;"
-   };
-if (artSlave.skin == "camouflage patterned") {
-   colorSlave.skinColor = "#78875a";
-   colorSlave.areolaColor = "#939F7A";
-   colorSlave.labiaColor = "#F977A3";
-   colorSlave.lipsColor = "#708050";
- } else if (artSlave.skin == "dyed red") {
-   colorSlave.skinColor = "#bc4949";
-   colorSlave.areolaColor = "#C96D6D";
-   colorSlave.labiaColor = "#F977A3";
-   colorSlave.lipsColor = "#b04040";
- } else if (artSlave.skin == "dyed green") {
-   colorSlave.skinColor = "#A6C373";
-   colorSlave.areolaColor = "#B7CF8F";
-   colorSlave.labiaColor = "#F977A3";
-   colorSlave.lipsColor = "#A0C070";
- } else if (artSlave.skin == "dyed blue") {
-   colorSlave.skinColor = "#5b8eb7";
-   colorSlave.areolaColor = "#7BA4C5";
-   colorSlave.labiaColor = "#F977A3";
-   colorSlave.lipsColor = "#5080b0";
- } else if (artSlave.skin == "dyed pink") {
-   colorSlave.skinColor = "#fe62b0";
-   colorSlave.areolaColor = "#fc45a1";
-   colorSlave.labiaColor = "#fba2c0";
-   colorSlave.lipsColor = "#ff4291";
- } else if (artSlave.skin == "dyed gray") {
-   colorSlave.skinColor = "#bdbdbd";
-   colorSlave.areolaColor = "#666666";
-   colorSlave.labiaColor = "#8C8C8C";
-   colorSlave.lipsColor = "#171717";
- } else if (artSlave.skin == "tiger striped") {
-   colorSlave.skinColor = "#e2d75d";
-   colorSlave.areolaColor = "#E7DF7D";
-   colorSlave.labiaColor = "#F977A3";
-   colorSlave.lipsColor = "#e0d050";
-} else if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#F4EAF0";
-	colorSlave.areolaColor = "#FCCCDC";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#F4EAF0";
-	colorSlave.areolaColor = "#FCCCDC";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#F5E1DF";
-	colorSlave.areolaColor = "#EFBFCA";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#F5E1DF";
-	colorSlave.areolaColor = "#EFBFCA";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#F5D5C9";
-	colorSlave.areolaColor = "#E2B4B9";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#F5D5C9";
-	colorSlave.areolaColor = "#E2B4B9";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#F4C9AA";
-	colorSlave.areolaColor = "#F19795";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#F4C9AA";
-	colorSlave.areolaColor = "#F19795";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#F4C9AA";
-	colorSlave.areolaColor = "#F19795";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#E1B585";
-	colorSlave.areolaColor = "#C39696";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#E1B585";
-	colorSlave.areolaColor = "#C39696";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#D58E5F";
-	colorSlave.areolaColor = "#B17777";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#D58E5F";
-	colorSlave.areolaColor = "#B17777";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#D58E5F";
-	colorSlave.areolaColor = "#B17777";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#A2805C";
-	colorSlave.areolaColor = "#8E6454";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#825633";
-	colorSlave.areolaColor = "#734B2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#784F2F";
-	colorSlave.areolaColor = "#583E2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#784F2F";
-	colorSlave.areolaColor = "#583E2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#65422C";
-	colorSlave.areolaColor = "#4A3A33";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#65422C";
-	colorSlave.areolaColor = "#4A3A33";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#D58E5F";
-	colorSlave.areolaColor = "#B17777";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+window.skinColorCatcher = function (artSlave) {
+	var colorSlave = {
+		skinColor: "#e8b693;",
+		areolaColor: "#d76b93;",
+		labiaColor: "#d76b93;",
+		lipsColor: "#ff69b4;"
+	};
+	if (artSlave.skin == "camouflage patterned") {
+		colorSlave.skinColor = "#78875a";
+		colorSlave.areolaColor = "#939F7A";
+		colorSlave.labiaColor = "#F977A3";
+		colorSlave.lipsColor = "#708050";
+	} else if (artSlave.skin == "dyed red") {
+		colorSlave.skinColor = "#bc4949";
+		colorSlave.areolaColor = "#C96D6D";
+		colorSlave.labiaColor = "#F977A3";
+		colorSlave.lipsColor = "#b04040";
+	} else if (artSlave.skin == "dyed green") {
+		colorSlave.skinColor = "#A6C373";
+		colorSlave.areolaColor = "#B7CF8F";
+		colorSlave.labiaColor = "#F977A3";
+		colorSlave.lipsColor = "#A0C070";
+	} else if (artSlave.skin == "dyed blue") {
+		colorSlave.skinColor = "#5b8eb7";
+		colorSlave.areolaColor = "#7BA4C5";
+		colorSlave.labiaColor = "#F977A3";
+		colorSlave.lipsColor = "#5080b0";
+	} else if (artSlave.skin == "dyed pink") {
+		colorSlave.skinColor = "#fe62b0";
+		colorSlave.areolaColor = "#fc45a1";
+		colorSlave.labiaColor = "#fba2c0";
+		colorSlave.lipsColor = "#ff4291";
+	} else if (artSlave.skin == "dyed gray") {
+		colorSlave.skinColor = "#bdbdbd";
+		colorSlave.areolaColor = "#666666";
+		colorSlave.labiaColor = "#8C8C8C";
+		colorSlave.lipsColor = "#171717";
+	} else if (artSlave.skin == "tiger striped") {
+		colorSlave.skinColor = "#e2d75d";
+		colorSlave.areolaColor = "#E7DF7D";
+		colorSlave.labiaColor = "#F977A3";
+		colorSlave.lipsColor = "#e0d050";
+	} else if (artSlave.race == "white" || artSlave.race == "surgically altered to look white") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#F4EAF0";
+			colorSlave.areolaColor = "#FCCCDC";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#F4EAF0";
+			colorSlave.areolaColor = "#FCCCDC";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#F5E1DF";
+			colorSlave.areolaColor = "#EFBFCA";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#F5E1DF";
+			colorSlave.areolaColor = "#EFBFCA";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#F5D5C9";
+			colorSlave.areolaColor = "#E2B4B9";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#F5D5C9";
+			colorSlave.areolaColor = "#E2B4B9";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#F4C9AA";
+			colorSlave.areolaColor = "#F19795";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#F4C9AA";
+			colorSlave.areolaColor = "#F19795";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#F4C9AA";
+			colorSlave.areolaColor = "#F19795";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#E1B585";
+			colorSlave.areolaColor = "#C39696";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#E1B585";
+			colorSlave.areolaColor = "#C39696";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#D58E5F";
+			colorSlave.areolaColor = "#B17777";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#D58E5F";
+			colorSlave.areolaColor = "#B17777";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#D58E5F";
+			colorSlave.areolaColor = "#B17777";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#A2805C";
+			colorSlave.areolaColor = "#8E6454";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#825633";
+			colorSlave.areolaColor = "#734B2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#784F2F";
+			colorSlave.areolaColor = "#583E2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#784F2F";
+			colorSlave.areolaColor = "#583E2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#65422C";
+			colorSlave.areolaColor = "#4A3A33";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#65422C";
+			colorSlave.areolaColor = "#4A3A33";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#D58E5F";
+			colorSlave.areolaColor = "#B17777";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FEE4CA";
-	colorSlave.areolaColor = "#E0B3A2";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FEE4CA";
-	colorSlave.areolaColor = "#E0B3A2";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#E3C5A7";
-	colorSlave.areolaColor = "#EFBDC9";
-	colorSlave.labiaColor = "#CC9B88";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#E3C5A7";
-	colorSlave.areolaColor = "#CC9B88";
-	colorSlave.labiaColor = "#CC9B88";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#DEB892";
-	colorSlave.areolaColor = "#AB806F";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#DEB892";
-	colorSlave.areolaColor = "#AB806F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#D59D73";
-	colorSlave.areolaColor = "#8D6859";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#D59D73";
-	colorSlave.areolaColor = "#8D6859";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#D59D73";
-	colorSlave.areolaColor = "#8D6859";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#AC7C4A";
-	colorSlave.areolaColor = "#7C594B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#AC7C4A";
-	colorSlave.areolaColor = "#7C594B";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#985C34";
-	colorSlave.areolaColor = "#764B3A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#985C34";
-	colorSlave.areolaColor = "#764B3A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#985C34";
-	colorSlave.areolaColor = "#764B3A";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#745C42";
-	colorSlave.areolaColor = "#63463B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#65422C";
-	colorSlave.areolaColor = "#4B3121";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#5A3C24";
-	colorSlave.areolaColor = "#493326";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#5A3C24";
-	colorSlave.areolaColor = "#493326";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#46362C";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#583D3D";
-	colorSlave.areolaColor = "#3B3028";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#4A3A33";
-	colorSlave.areolaColor = "#332B27";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#312926";
-	colorSlave.areolaColor = "#181616";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#985C34";
-	colorSlave.areolaColor = "#764B3A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "black" || artSlave.race == "surgically altered to look black") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FEE4CA";
+			colorSlave.areolaColor = "#E0B3A2";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FEE4CA";
+			colorSlave.areolaColor = "#E0B3A2";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#E3C5A7";
+			colorSlave.areolaColor = "#EFBDC9";
+			colorSlave.labiaColor = "#CC9B88";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#E3C5A7";
+			colorSlave.areolaColor = "#CC9B88";
+			colorSlave.labiaColor = "#CC9B88";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#DEB892";
+			colorSlave.areolaColor = "#AB806F";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#DEB892";
+			colorSlave.areolaColor = "#AB806F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#D59D73";
+			colorSlave.areolaColor = "#8D6859";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#D59D73";
+			colorSlave.areolaColor = "#8D6859";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#D59D73";
+			colorSlave.areolaColor = "#8D6859";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#AC7C4A";
+			colorSlave.areolaColor = "#7C594B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#AC7C4A";
+			colorSlave.areolaColor = "#7C594B";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#985C34";
+			colorSlave.areolaColor = "#764B3A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#985C34";
+			colorSlave.areolaColor = "#764B3A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#985C34";
+			colorSlave.areolaColor = "#764B3A";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#745C42";
+			colorSlave.areolaColor = "#63463B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#65422C";
+			colorSlave.areolaColor = "#4B3121";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#5A3C24";
+			colorSlave.areolaColor = "#493326";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#5A3C24";
+			colorSlave.areolaColor = "#493326";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#46362C";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#583D3D";
+			colorSlave.areolaColor = "#3B3028";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#4A3A33";
+			colorSlave.areolaColor = "#332B27";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#312926";
+			colorSlave.areolaColor = "#181616";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#985C34";
+			colorSlave.areolaColor = "#764B3A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FEDECE";
-	colorSlave.areolaColor = "#E3BBAB";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FEDECE";
-	colorSlave.areolaColor = "#E3BBAB";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#E6C2B0";
-	colorSlave.areolaColor = "#D1A695";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#E6C2B0";
-	colorSlave.areolaColor = "#D1A695";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#E1B59F";
-	colorSlave.areolaColor = "#B48D7E";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#E1B59F";
-	colorSlave.areolaColor = "#B48D7E";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#B27554";
-	colorSlave.areolaColor = "#92684C";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#B27554";
-	colorSlave.areolaColor = "#92684C";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#8B644F";
-	colorSlave.areolaColor = "#7B5749";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#775031";
-	colorSlave.areolaColor = "#69452F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#774A31";
-	colorSlave.areolaColor = "#614330";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#774A31";
-	colorSlave.areolaColor = "#614330";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#74523E";
-	colorSlave.areolaColor = "#573F30";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#6B4B4B";
-	colorSlave.areolaColor = "#473426";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#634F45";
-	colorSlave.areolaColor = "#4D3A2E";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#634F45";
-	colorSlave.areolaColor = "#4D3A2E";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "latina" || artSlave.race == "surgically altered to look latina") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FEDECE";
+			colorSlave.areolaColor = "#E3BBAB";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FEDECE";
+			colorSlave.areolaColor = "#E3BBAB";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#E6C2B0";
+			colorSlave.areolaColor = "#D1A695";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#E6C2B0";
+			colorSlave.areolaColor = "#D1A695";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#E1B59F";
+			colorSlave.areolaColor = "#B48D7E";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#E1B59F";
+			colorSlave.areolaColor = "#B48D7E";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#B27554";
+			colorSlave.areolaColor = "#92684C";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#B27554";
+			colorSlave.areolaColor = "#92684C";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#8B644F";
+			colorSlave.areolaColor = "#7B5749";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#775031";
+			colorSlave.areolaColor = "#69452F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#774A31";
+			colorSlave.areolaColor = "#614330";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#774A31";
+			colorSlave.areolaColor = "#614330";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#74523E";
+			colorSlave.areolaColor = "#573F30";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#6B4B4B";
+			colorSlave.areolaColor = "#473426";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#634F45";
+			colorSlave.areolaColor = "#4D3A2E";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#634F45";
+			colorSlave.areolaColor = "#4D3A2E";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FFF8EE";
-	colorSlave.areolaColor = "#F7DBD0";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FFF8EE";
-	colorSlave.areolaColor = "#F7DBD0";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#F5E7DC";
-	colorSlave.areolaColor = "#EABFB3";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#F5E7DC";
-	colorSlave.areolaColor = "#EABFB3";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#F5D4B5";
-	colorSlave.areolaColor = "#CB988B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#F5D4B5";
-	colorSlave.areolaColor = "#CB988B";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#CFB48D";
-	colorSlave.areolaColor = "#AC8074";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#CFB48D";
-	colorSlave.areolaColor = "#AC8074";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#9A774A";
-	colorSlave.areolaColor = "#855E4E";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#855834";
-	colorSlave.areolaColor = "#734B2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#83522B";
-	colorSlave.areolaColor = "#68442A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#83522B";
-	colorSlave.areolaColor = "#68442A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#724826";
-	colorSlave.areolaColor = "#5C3D26";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#724826";
-	colorSlave.areolaColor = "#5C3D26";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "asian" || artSlave.race == "surgically altered to look asian") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FFF8EE";
+			colorSlave.areolaColor = "#F7DBD0";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FFF8EE";
+			colorSlave.areolaColor = "#F7DBD0";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#F5E7DC";
+			colorSlave.areolaColor = "#EABFB3";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#F5E7DC";
+			colorSlave.areolaColor = "#EABFB3";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#F5D4B5";
+			colorSlave.areolaColor = "#CB988B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#F5D4B5";
+			colorSlave.areolaColor = "#CB988B";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#CFB48D";
+			colorSlave.areolaColor = "#AC8074";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#CFB48D";
+			colorSlave.areolaColor = "#AC8074";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#9A774A";
+			colorSlave.areolaColor = "#855E4E";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#855834";
+			colorSlave.areolaColor = "#734B2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#83522B";
+			colorSlave.areolaColor = "#68442A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#83522B";
+			colorSlave.areolaColor = "#68442A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#724826";
+			colorSlave.areolaColor = "#5C3D26";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#724826";
+			colorSlave.areolaColor = "#5C3D26";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#E8CFCF";
-	colorSlave.areolaColor = "#DCADBC";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#E8CFCF";
-	colorSlave.areolaColor = "#DCADBC";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#FBCCC6";
-	colorSlave.areolaColor = "#E79E8B";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#FBCCC6";
-	colorSlave.areolaColor = "#E79E8B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#EAAB92";
-	colorSlave.areolaColor = "#D27B64";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#EAAB92";
-	colorSlave.areolaColor = "#D27B64";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#CC8D53";
-	colorSlave.areolaColor = "#A7624F";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#CC8D53";
-	colorSlave.areolaColor = "#A7624F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#84684A";
-	colorSlave.areolaColor = "#735143";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#684528";
-	colorSlave.areolaColor = "#563826";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#6E4730";
-	colorSlave.areolaColor = "#604534";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#6E4730";
-	colorSlave.areolaColor = "#604534";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#604534";
-	colorSlave.areolaColor = "#514039";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#604534 ";
-	colorSlave.areolaColor = "#514039";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "middle eastern" || artSlave.race == "surgically altered to look middle eastern") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#E8CFCF";
+			colorSlave.areolaColor = "#DCADBC";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#E8CFCF";
+			colorSlave.areolaColor = "#DCADBC";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#FBCCC6";
+			colorSlave.areolaColor = "#E79E8B";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#FBCCC6";
+			colorSlave.areolaColor = "#E79E8B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#EAAB92";
+			colorSlave.areolaColor = "#D27B64";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#EAAB92";
+			colorSlave.areolaColor = "#D27B64";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#CC8D53";
+			colorSlave.areolaColor = "#A7624F";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#CC8D53";
+			colorSlave.areolaColor = "#A7624F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#84684A";
+			colorSlave.areolaColor = "#735143";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#684528";
+			colorSlave.areolaColor = "#563826";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#6E4730";
+			colorSlave.areolaColor = "#604534";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#6E4730";
+			colorSlave.areolaColor = "#604534";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#604534";
+			colorSlave.areolaColor = "#514039";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#604534 ";
+			colorSlave.areolaColor = "#514039";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FDE4BF";
-	colorSlave.areolaColor = "#F0BEAA";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FDE4BF";
-	colorSlave.areolaColor = "#F0BEAA";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#F5E7DC";
-	colorSlave.areolaColor = "#CDA499";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#F5E7DC";
-	colorSlave.areolaColor = "#CDA499";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#F5D4B5";
-	colorSlave.areolaColor = "#CB988B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#F5D4B5";
-	colorSlave.areolaColor = "#CB988B";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#F4D1A3";
-	colorSlave.areolaColor = "#BA8E83";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#CFB48D";
-	colorSlave.areolaColor = "#AC8074";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#CFB48D";
-	colorSlave.areolaColor = "#AC8074";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#9A774A";
-	colorSlave.areolaColor = "#855E4E";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#855834";
-	colorSlave.areolaColor = "#734B2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#83522B";
-	colorSlave.areolaColor = "#68442A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#83522B";
-	colorSlave.areolaColor = "#68442A";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#724826";
-	colorSlave.areolaColor = "#5C3D26";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#724826";
-	colorSlave.areolaColor = "#5C3D26";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#C38C4D";
-	colorSlave.areolaColor = "#A67A6F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "amerindian" || artSlave.race == "surgically altered to look amerindian") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FDE4BF";
+			colorSlave.areolaColor = "#F0BEAA";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FDE4BF";
+			colorSlave.areolaColor = "#F0BEAA";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#F5E7DC";
+			colorSlave.areolaColor = "#CDA499";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#F5E7DC";
+			colorSlave.areolaColor = "#CDA499";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#F5D4B5";
+			colorSlave.areolaColor = "#CB988B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#F5D4B5";
+			colorSlave.areolaColor = "#CB988B";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#F4D1A3";
+			colorSlave.areolaColor = "#BA8E83";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#CFB48D";
+			colorSlave.areolaColor = "#AC8074";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#CFB48D";
+			colorSlave.areolaColor = "#AC8074";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#9A774A";
+			colorSlave.areolaColor = "#855E4E";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#855834";
+			colorSlave.areolaColor = "#734B2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#83522B";
+			colorSlave.areolaColor = "#68442A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#83522B";
+			colorSlave.areolaColor = "#68442A";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#724826";
+			colorSlave.areolaColor = "#5C3D26";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#724826";
+			colorSlave.areolaColor = "#5C3D26";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#C38C4D";
+			colorSlave.areolaColor = "#A67A6F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#EBDBE4";
-	colorSlave.areolaColor = "#FFE4E0";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#EBDBE4";
-	colorSlave.areolaColor = "#FFE4E0";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#F0D0CC";
-	colorSlave.areolaColor = "#EAACBA";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#F0D0CC";
-	colorSlave.areolaColor = "#EAACBA";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#F1C6B5";
-	colorSlave.areolaColor = "#DCA2A9";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#F1C6B5";
-	colorSlave.areolaColor = "#DCA2A9";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#F2BC94";
-	colorSlave.areolaColor = "#EE8280";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#F2BC94";
-	colorSlave.areolaColor = "#EE8280";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#F2BC94";
-	colorSlave.areolaColor = "#EE8280";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#DCA972";
-	colorSlave.areolaColor = "#BF7577";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#DCA972";
-	colorSlave.areolaColor = "#BF7577";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#D0814C";
-	colorSlave.areolaColor = "#A96767";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#D0814C";
-	colorSlave.areolaColor = "#A96767";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#D0814C";
-	colorSlave.areolaColor = "#A96767";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#937453";
-	colorSlave.areolaColor = "#7F5A4B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#7F5431";
-	colorSlave.areolaColor = "#734B2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#784F2F";
-	colorSlave.areolaColor = "#583E2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#784F2F";
-	colorSlave.areolaColor = "#583E2F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#65422C";
-	colorSlave.areolaColor = "#4A3A33";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#65422C";
-	colorSlave.areolaColor = "#4A3A33";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#D0814C";
-	colorSlave.areolaColor = "#A96767";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "southern european" || artSlave.race == "surgically altered to look southern european") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#EBDBE4";
+			colorSlave.areolaColor = "#FFE4E0";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#EBDBE4";
+			colorSlave.areolaColor = "#FFE4E0";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#F0D0CC";
+			colorSlave.areolaColor = "#EAACBA";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#F0D0CC";
+			colorSlave.areolaColor = "#EAACBA";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#F1C6B5";
+			colorSlave.areolaColor = "#DCA2A9";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#F1C6B5";
+			colorSlave.areolaColor = "#DCA2A9";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#F2BC94";
+			colorSlave.areolaColor = "#EE8280";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#F2BC94";
+			colorSlave.areolaColor = "#EE8280";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#F2BC94";
+			colorSlave.areolaColor = "#EE8280";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#DCA972";
+			colorSlave.areolaColor = "#BF7577";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#DCA972";
+			colorSlave.areolaColor = "#BF7577";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#D0814C";
+			colorSlave.areolaColor = "#A96767";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#D0814C";
+			colorSlave.areolaColor = "#A96767";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#D0814C";
+			colorSlave.areolaColor = "#A96767";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#937453";
+			colorSlave.areolaColor = "#7F5A4B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#7F5431";
+			colorSlave.areolaColor = "#734B2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#784F2F";
+			colorSlave.areolaColor = "#583E2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#784F2F";
+			colorSlave.areolaColor = "#583E2F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#65422C";
+			colorSlave.areolaColor = "#4A3A33";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#65422C";
+			colorSlave.areolaColor = "#4A3A33";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#D0814C";
+			colorSlave.areolaColor = "#A96767";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#E8CFCF";
-	colorSlave.areolaColor = "#DCADBC";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#E8CFCF";
-	colorSlave.areolaColor = "#DCADBC";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#FBCCC6";
-	colorSlave.areolaColor = "#E79E8B";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#FBCCC6";
-	colorSlave.areolaColor = "#E79E8B";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#EAAB92";
-	colorSlave.areolaColor = "#D27B64";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#EAAB92";
-	colorSlave.areolaColor = "#D27B64";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#EDA571";
-	colorSlave.areolaColor = "#B16854";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#CC8D53";
-	colorSlave.areolaColor = "#A7624F";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#CC8D53";
-	colorSlave.areolaColor = "#A7624F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#84684A";
-	colorSlave.areolaColor = "#735143";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#684528";
-	colorSlave.areolaColor = "#563826";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#6E4730";
-	colorSlave.areolaColor = "#604534";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#6E4730";
-	colorSlave.areolaColor = "#604534";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#604534";
-	colorSlave.areolaColor = "#514039";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#604534 ";
-	colorSlave.areolaColor = "#514039";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#CA7136";
-	colorSlave.areolaColor = "#9B5959";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "semitic" || artSlave.race == "surgically altered to look semitic") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#E8CFCF";
+			colorSlave.areolaColor = "#DCADBC";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#E8CFCF";
+			colorSlave.areolaColor = "#DCADBC";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#FBCCC6";
+			colorSlave.areolaColor = "#E79E8B";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#FBCCC6";
+			colorSlave.areolaColor = "#E79E8B";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#EAAB92";
+			colorSlave.areolaColor = "#D27B64";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#EAAB92";
+			colorSlave.areolaColor = "#D27B64";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#EDA571";
+			colorSlave.areolaColor = "#B16854";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#CC8D53";
+			colorSlave.areolaColor = "#A7624F";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#CC8D53";
+			colorSlave.areolaColor = "#A7624F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#84684A";
+			colorSlave.areolaColor = "#735143";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#684528";
+			colorSlave.areolaColor = "#563826";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#6E4730";
+			colorSlave.areolaColor = "#604534";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#6E4730";
+			colorSlave.areolaColor = "#604534";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#604534";
+			colorSlave.areolaColor = "#514039";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#604534 ";
+			colorSlave.areolaColor = "#514039";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#CA7136";
+			colorSlave.areolaColor = "#9B5959";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FBD1B2";
-	colorSlave.areolaColor = "#F39E7D";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FBD1B2";
-	colorSlave.areolaColor = "#F39E7D";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#E8B892";
-	colorSlave.areolaColor = "#E2856C";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#E8B892";
-	colorSlave.areolaColor = "#E2856C";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#EA9870";
-	colorSlave.areolaColor = "#BE6C56";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#EA9870";
-	colorSlave.areolaColor = "#BE6C56";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#BA855E";
-	colorSlave.areolaColor = "#976051";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#BA855E";
-	colorSlave.areolaColor = "#976051";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#7C563C";
-	colorSlave.areolaColor = "#70493A";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#804A28";
-	colorSlave.areolaColor = "#5F3F27";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#6F4523";
-	colorSlave.areolaColor = "#623C20";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#6F4523";
-	colorSlave.areolaColor = "#623C20";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#6F3E27";
-	colorSlave.areolaColor = "#553823";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#6F3E27";
-	colorSlave.areolaColor = "#553823";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "malay" || artSlave.race == "surgically altered to look malay") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FBD1B2";
+			colorSlave.areolaColor = "#F39E7D";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FBD1B2";
+			colorSlave.areolaColor = "#F39E7D";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#E8B892";
+			colorSlave.areolaColor = "#E2856C";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#E8B892";
+			colorSlave.areolaColor = "#E2856C";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#EA9870";
+			colorSlave.areolaColor = "#BE6C56";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#EA9870";
+			colorSlave.areolaColor = "#BE6C56";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#BA855E";
+			colorSlave.areolaColor = "#976051";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#BA855E";
+			colorSlave.areolaColor = "#976051";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#7C563C";
+			colorSlave.areolaColor = "#70493A";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#804A28";
+			colorSlave.areolaColor = "#5F3F27";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#6F4523";
+			colorSlave.areolaColor = "#623C20";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#6F4523";
+			colorSlave.areolaColor = "#623C20";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#6F3E27";
+			colorSlave.areolaColor = "#553823";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#6F3E27";
+			colorSlave.areolaColor = "#553823";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#F8D4BE";
-	colorSlave.areolaColor = "#F8B6A4";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#F8D4BE";
-	colorSlave.areolaColor = "#F8B6A4";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#EFCCAF";
-	colorSlave.areolaColor = "#EA9B86";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#EFCCAF";
-	colorSlave.areolaColor = "#EA9B86";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#FCC49A";
-	colorSlave.areolaColor = "#D29577";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#FCC49A";
-	colorSlave.areolaColor = "#D29577";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#E8B68E";
-	colorSlave.areolaColor = "#D08661";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#E8B68E";
-	colorSlave.areolaColor = "#D08661";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#E8B68E";
-	colorSlave.areolaColor = "#D08661";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#C36E45";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#C36E45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#A75A34";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#A75A34";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#A75A34";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#83684B";
-	colorSlave.areolaColor = "#715043";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#8A593C";
-	colorSlave.areolaColor = "#714931";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#845834";
-	colorSlave.areolaColor = "#614635";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#845834";
-	colorSlave.areolaColor = "#614635";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#7C5842";
-	colorSlave.areolaColor = "#5F4538";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#7C5842";
-	colorSlave.areolaColor = "#5F4538";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#6B5449";
-	colorSlave.areolaColor = "#473C37";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#6B5449";
-	colorSlave.areolaColor = "#473C37";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#C17848";
-	colorSlave.areolaColor = "#A75A34";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "indo-aryan" || artSlave.race == "surgically altered to look indo-aryan") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#F8D4BE";
+			colorSlave.areolaColor = "#F8B6A4";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#F8D4BE";
+			colorSlave.areolaColor = "#F8B6A4";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#EFCCAF";
+			colorSlave.areolaColor = "#EA9B86";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#EFCCAF";
+			colorSlave.areolaColor = "#EA9B86";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#FCC49A";
+			colorSlave.areolaColor = "#D29577";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#FCC49A";
+			colorSlave.areolaColor = "#D29577";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#E8B68E";
+			colorSlave.areolaColor = "#D08661";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#E8B68E";
+			colorSlave.areolaColor = "#D08661";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#E8B68E";
+			colorSlave.areolaColor = "#D08661";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#C36E45";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#C36E45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#A75A34";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#A75A34";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#A75A34";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#83684B";
+			colorSlave.areolaColor = "#715043";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#8A593C";
+			colorSlave.areolaColor = "#714931";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#845834";
+			colorSlave.areolaColor = "#614635";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#845834";
+			colorSlave.areolaColor = "#614635";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#7C5842";
+			colorSlave.areolaColor = "#5F4538";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#7C5842";
+			colorSlave.areolaColor = "#5F4538";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#6B5449";
+			colorSlave.areolaColor = "#473C37";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#6B5449";
+			colorSlave.areolaColor = "#473C37";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#C17848";
+			colorSlave.areolaColor = "#A75A34";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FBD1B2";
-	colorSlave.areolaColor = "#F39E7D";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FBD1B2";
-	colorSlave.areolaColor = "#F39E7D";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#E8B892";
-	colorSlave.areolaColor = "#E2856C";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#E8B892";
-	colorSlave.areolaColor = "#E2856C";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#EA9870";
-	colorSlave.areolaColor = "#BE6C56";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#EA9870";
-	colorSlave.areolaColor = "#BE6C56";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#EA9760";
-	colorSlave.areolaColor = "#AB6755";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#BA855E";
-	colorSlave.areolaColor = "#976051";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#BA855E";
-	colorSlave.areolaColor = "#976051";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#7C563C";
-	colorSlave.areolaColor = "#70493A";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#804A28";
-	colorSlave.areolaColor = "#5F3F27";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#6F4523";
-	colorSlave.areolaColor = "#623C20";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#6F4523";
-	colorSlave.areolaColor = "#623C20";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#6F3E27";
-	colorSlave.areolaColor = "#553823";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#6F3E27";
-	colorSlave.areolaColor = "#553823";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#583E2F";
-	colorSlave.areolaColor = "#3F3A38";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#A46138";
-	colorSlave.areolaColor = "#8F5E51";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
+	} else if (artSlave.race == "pacific islander" || artSlave.race == "surgically altered to look pacific islander") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FBD1B2";
+			colorSlave.areolaColor = "#F39E7D";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FBD1B2";
+			colorSlave.areolaColor = "#F39E7D";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#E8B892";
+			colorSlave.areolaColor = "#E2856C";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#E8B892";
+			colorSlave.areolaColor = "#E2856C";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#EA9870";
+			colorSlave.areolaColor = "#BE6C56";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#EA9870";
+			colorSlave.areolaColor = "#BE6C56";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#EA9760";
+			colorSlave.areolaColor = "#AB6755";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#BA855E";
+			colorSlave.areolaColor = "#976051";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#BA855E";
+			colorSlave.areolaColor = "#976051";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#7C563C";
+			colorSlave.areolaColor = "#70493A";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#804A28";
+			colorSlave.areolaColor = "#5F3F27";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#6F4523";
+			colorSlave.areolaColor = "#623C20";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#6F4523";
+			colorSlave.areolaColor = "#623C20";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#6F3E27";
+			colorSlave.areolaColor = "#553823";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#6F3E27";
+			colorSlave.areolaColor = "#553823";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#583E2F";
+			colorSlave.areolaColor = "#3F3A38";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#A46138";
+			colorSlave.areolaColor = "#8F5E51";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
 
-} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
-  if (artSlave.skin == "pure white") {
-	colorSlave.skinColor = "#FEE5CC";
-	colorSlave.areolaColor = "#E3BBAB";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "extremely pale") {
-	colorSlave.skinColor = "#FEE5CC";
-	colorSlave.areolaColor = "#E3BBAB";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "pale") {
-	colorSlave.skinColor = "#E6C2B0";
-	colorSlave.areolaColor = "#D1A695";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ffb9ca";
-  } else if (artSlave.skin == "extremely fair") {
-	colorSlave.skinColor = "#E6C2B0";
-	colorSlave.areolaColor = "#D1A695";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "very fair") {
-	colorSlave.skinColor = "#E1B59F";
-	colorSlave.areolaColor = "#B48D7E";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "fair") {
-	colorSlave.skinColor = "#E1B59F";
-	colorSlave.areolaColor = "#B48D7E";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "white") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "lightened") {
-	colorSlave.skinColor = "#DAA782";
-	colorSlave.areolaColor = "#9E7666";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#ce6876";
-  } else if (artSlave.skin == "light olive") {
-	colorSlave.skinColor = "#B27554";
-	colorSlave.areolaColor = "#92684C";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "olive") {
-	colorSlave.skinColor = "#B27554";
-	colorSlave.areolaColor = "#92684C";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#c1a785";
-  } else if (artSlave.skin == "natural") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "tanned") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  } else if (artSlave.skin == "bronzed") {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark olive") {
-	colorSlave.skinColor = "#8B644F";
-	colorSlave.areolaColor = "#7B5749";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "dark") {
-	colorSlave.skinColor = "#775031";
-	colorSlave.areolaColor = "#69452F";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "light brown") {
-	colorSlave.skinColor = "#774A31";
-	colorSlave.areolaColor = "#5E4434";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#5d2f1b";
-  } else if (artSlave.skin == "brown") {
-	colorSlave.skinColor = "#774A31";
-	colorSlave.areolaColor = "#5E4434";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#714536";
-  } else if (artSlave.skin == "dark brown") {
-	colorSlave.skinColor = "#74523E";
-	colorSlave.areolaColor = "#574135";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "black") {
-	colorSlave.skinColor = "#6B4B4B";
-	colorSlave.areolaColor = "#413228";
-	colorSlave.labiaColor = "#F977A3";
-  } else if (artSlave.skin == "ebony") {
-	colorSlave.skinColor = "#634F45";
-	colorSlave.areolaColor = "#4E3C32";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#403030";
-  }	else if (artSlave.skin == "pure black") {
-	colorSlave.skinColor = "#634F45";
-	colorSlave.areolaColor = "#4E3C32";
-	colorSlave.labiaColor = "#F977A3";
-  } else {
-	colorSlave.skinColor = "#B6784E";
-	colorSlave.areolaColor = "#8F5A45";
-	colorSlave.labiaColor = "#F977A3";
-	colorSlave.lipsColor = "#9e4c44";
-  }
-}
-   return colorSlave;
-};
+	} else if (artSlave.race == "mixed race" || artSlave.race == "surgically altered to look mixed race") {
+		if (artSlave.skin == "pure white") {
+			colorSlave.skinColor = "#FEE5CC";
+			colorSlave.areolaColor = "#E3BBAB";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "extremely pale") {
+			colorSlave.skinColor = "#FEE5CC";
+			colorSlave.areolaColor = "#E3BBAB";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "pale") {
+			colorSlave.skinColor = "#E6C2B0";
+			colorSlave.areolaColor = "#D1A695";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ffb9ca";
+		} else if (artSlave.skin == "extremely fair") {
+			colorSlave.skinColor = "#E6C2B0";
+			colorSlave.areolaColor = "#D1A695";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "very fair") {
+			colorSlave.skinColor = "#E1B59F";
+			colorSlave.areolaColor = "#B48D7E";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "fair") {
+			colorSlave.skinColor = "#E1B59F";
+			colorSlave.areolaColor = "#B48D7E";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "white") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "lightened") {
+			colorSlave.skinColor = "#DAA782";
+			colorSlave.areolaColor = "#9E7666";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#ce6876";
+		} else if (artSlave.skin == "light olive") {
+			colorSlave.skinColor = "#B27554";
+			colorSlave.areolaColor = "#92684C";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "olive") {
+			colorSlave.skinColor = "#B27554";
+			colorSlave.areolaColor = "#92684C";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#c1a785";
+		} else if (artSlave.skin == "natural") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "tanned") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		} else if (artSlave.skin == "bronzed") {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark olive") {
+			colorSlave.skinColor = "#8B644F";
+			colorSlave.areolaColor = "#7B5749";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "dark") {
+			colorSlave.skinColor = "#775031";
+			colorSlave.areolaColor = "#69452F";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "light brown") {
+			colorSlave.skinColor = "#774A31";
+			colorSlave.areolaColor = "#5E4434";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#5d2f1b";
+		} else if (artSlave.skin == "brown") {
+			colorSlave.skinColor = "#774A31";
+			colorSlave.areolaColor = "#5E4434";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#714536";
+		} else if (artSlave.skin == "dark brown") {
+			colorSlave.skinColor = "#74523E";
+			colorSlave.areolaColor = "#574135";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "black") {
+			colorSlave.skinColor = "#6B4B4B";
+			colorSlave.areolaColor = "#413228";
+			colorSlave.labiaColor = "#F977A3";
+		} else if (artSlave.skin == "ebony") {
+			colorSlave.skinColor = "#634F45";
+			colorSlave.areolaColor = "#4E3C32";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#403030";
+		} else if (artSlave.skin == "pure black") {
+			colorSlave.skinColor = "#634F45";
+			colorSlave.areolaColor = "#4E3C32";
+			colorSlave.labiaColor = "#F977A3";
+		} else {
+			colorSlave.skinColor = "#B6784E";
+			colorSlave.areolaColor = "#8F5A45";
+			colorSlave.labiaColor = "#F977A3";
+			colorSlave.lipsColor = "#9e4c44";
+		}
+	}
+	return colorSlave;
+};
\ No newline at end of file
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index 5b453e509d6..4a4cd28aa36 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -73,50 +73,6 @@ vector art added later is drawn over previously added art
 <<include Art_Vector_Head_>> /* includes glasses */
 <<include Art_Vector_Hair_Fore_>>
 
-<<widget "AssistantArt">>
-<<if $imageChoice == 1>>
-	<<switch $assistantAppearance>>
-	<<case "amazon">>
-		<<set _fileName = "'resources/vector/avatar/amazon.png' ">>
-	<<case "angel">>
-		<<set _fileName = "'resources/vector/avatar/angel.png' ">>
-	<<case "businesswoman">>
-		<<set _fileName = "'resources/vector/avatar/businesswoman.png' ">>
-	<<case "cherub">>
-		<<set _fileName = "'resources/vector/avatar/cherub.png' ">>
-	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-		<<set _fileName = "'resources/vector/avatar/corrupt.png' ">>
-	<<case "fairy">>
-		<<set _fileName = "'resources/vector/avatar/fairy.png' ">>
-	<<case "goddess">>
-		<<set _fileName = "'resources/vector/avatar/goddess.png' ">>
-	<<case "imp">>
-		<<set _fileName = "'resources/vector/avatar/imp.png' ">>
-	<<case "incubus">>
-		<<set _fileName = "'resources/vector/avatar/incubus.png' ">>
-	<<case "monstergirl">>
-		<<set _fileName = "'resources/vector/avatar/monstergirl.png' ">>
-	<<case "pregnant fairy">>
-		<<set _fileName = "'resources/vector/avatar/pfairy.png' ">>
-	<<case "schoolgirl">>
-		<<set _fileName = "'resources/vector/avatar/schoolgirl.png' ">>
-	<<case "shemale">>
-		<<set _fileName = "'resources/vector/avatar/shemale.png' ">>
-	<<case "succubus">>
-		<<set _fileName = "'resources/vector/avatar/succubus.png' ">>
-	<<case "witch">>
-		<<set _fileName = "'resources/vector/avatar/witch.png' ">>
-	<<default>>
-		<<set _fileName = "'resources/vector/avatar/default.png' ">>
-	<</switch>>
-	<<if $args[1] == 3>>
-		<<print "<img src=" + _fileName + "style='float:right; border:3px hidden'/>">>
-	<<else>>
-		<<print "<img src=" + _fileName + "style='float:right; border:3px hidden' width='282' height='602'/>">>
-	<</if>>
-<</if>>
-<</widget>>
-
 <<elseif $imageChoice == 2>> /* VECTOR ART BY NOX - Pregmod Legacy Version */
 <<SVGFilters>>
 
diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/pregmod/assistantAppearancePackTwo.tw
index a7a7420956c..89ec0cf9df1 100644
--- a/src/pregmod/assistantAppearancePackTwo.tw
+++ b/src/pregmod/assistantAppearancePackTwo.tw
@@ -1,6 +1,6 @@
 :: Assistant Appearance Pack Two [nobr]
 
-<<if $seeImages == 1>><<= AssistantArtRendered(3)>><</if>>
+<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
 
 "Cool! New appearances to play around with!" Your assistant happily chimes. "Let's see what's inside! This looks heavenly..." She hunches forward as a large pair of white feathered wings extend from her upper back. She takes several experimental flaps before taking to the sky. "I feel positively radiant! Maybe a smaller version will be more to your liking?" She loses both height and wingspan until she stands roughly equivalent to <<= heightToEitherUnit(120)>>. She flutters around cutely. "This is neat, I'm like cupid. Want me to hook you up with anyone?" She winks as her wings become bat-like and a pair of cute little nubs appears on her head. "Or maybe you'd just like to play with me instead." The impish figure flirts, before landing and blossoming into a stunning woman. "You know a succubus can take her lover's ideal form." She runs her hands down her sides and to her crotch. <<if $seeDicks != 0>>She begins rubbing her clit as it steadily grows into a meaty cock. "Or an incubus, for the ladies." She returns to her previous form. <</if>>"Says here it comes with 'bonus novice witch' too. Neat. What's this though? It looks like an appeara"
 
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b22fe587b11..0e6a151b018 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2526,7 +2526,7 @@ running her tongue over her<<if $activeSlave.lips > 40>> whorish<<elseif $active
 
 <<case "PA flirting">>
 
-<<if $seeImages == 1>><<= AssistantArtRendered(2)>><</if>>
+<<if $seeImages == 1>><<= assistantArt(2)>><</if>>
 
 Partway through <<EventNameLink $activeSlave>>'s weekly inspection, you have to leave for a moment to deal with a minor matter. Inspecting such a devoted slave is a pleasure, but you tear yourself away. Such sacrifices must be made.
 <br><br>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 4b6873329a5..ece393ad698 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -4,7 +4,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
 
-<<if $seeImages == 1>><<= AssistantArtRendered(3)>><</if>>
+<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
 
 <<switch $Event>>
 <<case "assistant">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 6c64aecee43..9e62c644409 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -5,7 +5,7 @@
 
 <<if $marketAssistantLimit>><<set $marketAssistantLimit to Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
 
-<<if $seeImages == 1>><<= AssistantArtRendered(3)>><</if>>
+<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
 
 Seated at your desk, you glance at the visual representation of $assistantName, down in one corner of your desk's glass top.
 
-- 
GitLab