From 081510d319dad84d29c29e953d13e467af50e410 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 24 Mar 2019 22:50:26 -0500
Subject: [PATCH] PreSwitch

---
 devNotes/twine CSS                          |  1 -
 slave variables documentation - Pregmod.txt |  1 -
 src/cheats/mod_EditChildCheatNew.tw         | 26 +++++++-----
 src/cheats/mod_EditSlaveCheat.tw            | 13 +++---
 src/cheats/mod_editSlaveCheatNew.tw         | 13 +++---
 src/events/intro/introSummary.tw            | 13 +++---
 src/js/generateGenetics.js                  | 43 ++++++++++---------
 src/js/rulesAssistantOptions.js             | 25 ++++++++++-
 src/js/slaveSummaryWidgets.js               | 17 +++++---
 src/npc/databases/dSlavesDatabase.tw        |  4 +-
 src/npc/databases/ddSlavesDatabase.tw       |  2 +-
 src/npc/startingGirls/startingGirls.tw      | 47 +++++++++++----------
 12 files changed, 125 insertions(+), 80 deletions(-)

diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index ddf1b25561a..441e5eb416c 100644
--- a/devNotes/twine CSS	
+++ b/devNotes/twine CSS	
@@ -18,7 +18,6 @@ hr {
 	opacity: 1 !important;
 }
 
-
 /* default is 54em */
 #passages {
 	max-width: 100%;
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 628e86e4771..8fd576f3415 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -1101,7 +1101,6 @@ accepts string
 "fair"
 "white"
 "light"
-"lightened"
 "light olive"
 "olive"
 "natural"
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index a9f5198bb62..0b25bb169f5 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -702,21 +702,24 @@
 	<<textbox "$tempSlave.skin" $tempSlave.skin>>
 	<br>
 	<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+	<<radiobutton "$tempSlave.skin" "ivory">> Ivory
+	<<radiobutton "$tempSlave.skin" "white">> White
 	<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+	<<radiobutton "$tempSlave.skin" "very pale">> Very Pale
 	<<radiobutton "$tempSlave.skin" "pale">> Pale
 	<<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
 	<<radiobutton "$tempSlave.skin" "very fair">> Very Fair
 	<<radiobutton "$tempSlave.skin" "fair">> Fair
-	<<radiobutton "$tempSlave.skin" "white">> White
 	<<radiobutton "$tempSlave.skin" "light">> Light
-	<<radiobutton "$tempSlave.skin" "lightened">> Lightened
 	<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+	<<radiobutton "$tempSlave.skin" "tan">> Tan
 	<<radiobutton "$tempSlave.skin" "olive">> Olive
-	<<radiobutton "$tempSlave.skin" "natural">> Natural
-	<<radiobutton "$tempSlave.skin" "tanned">> Tanned
-	<<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+	<<radiobutton "$tempSlave.skin" "bronze">> Bronze
 	<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
 	<<radiobutton "$tempSlave.skin" "dark">> Dark
+	<<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+	<<radiobutton "$tempSlave.skin" "beige">> Beige
+	<<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
 	<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
 	<<radiobutton "$tempSlave.skin" "brown">> Brown
 	<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
@@ -729,21 +732,24 @@
 	<<textbox "$tempSlave.origSkin" $tempSlave.origSkin>>
 	<br>
 	<<radiobutton "$tempSlave.origSkin" "pure white">> Pure White
+	<<radiobutton "$tempSlave.origSkin" "ivory">> Ivory
+	<<radiobutton "$tempSlave.origSkin" "white">> White
 	<<radiobutton "$tempSlave.origSkin" "extremely pale">> Extremely Pale
+	<<radiobutton "$tempSlave.origSkin" "very pale">> Very Pale
 	<<radiobutton "$tempSlave.origSkin" "pale">> Pale
 	<<radiobutton "$tempSlave.origSkin" "extremely fair">> Extremely Fair
 	<<radiobutton "$tempSlave.origSkin" "very fair">> Very Fair
 	<<radiobutton "$tempSlave.origSkin" "fair">> Fair
-	<<radiobutton "$tempSlave.origSkin" "white">> White
 	<<radiobutton "$tempSlave.origSkin" "light">> Light
-	<<radiobutton "$tempSlave.origSkin" "lightened">> Lightened
 	<<radiobutton "$tempSlave.origSkin" "light olive">> Light Olive
+	<<radiobutton "$tempSlave.origSkin" "tan">> Tan
 	<<radiobutton "$tempSlave.origSkin" "olive">> Olive
-	<<radiobutton "$tempSlave.origSkin" "natural">> Natural
-	<<radiobutton "$tempSlave.origSkin" "tanned">> Tanned
-	<<radiobutton "$tempSlave.origSkin" "bronzed">> Bronzed
+	<<radiobutton "$tempSlave.origSkin" "bronze">> Bronze
 	<<radiobutton "$tempSlave.origSkin" "dark olive">> Dark Olive
 	<<radiobutton "$tempSlave.origSkin" "dark">> Dark
+	<<radiobutton "$tempSlave.origSkin" "light beige">> Light Beige
+	<<radiobutton "$tempSlave.origSkin" "beige">> Beige
+	<<radiobutton "$tempSlave.origSkin" "dark beige">> Dark Beige
 	<<radiobutton "$tempSlave.origSkin" "light brown">> Light Brown
 	<<radiobutton "$tempSlave.origSkin" "brown">> Brown
 	<<radiobutton "$tempSlave.origSkin" "dark brown">> Dark Brown
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 2c9cd767445..70fca74cc2d 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -137,21 +137,24 @@
 <<textbox "$tempSlave.skin" $tempSlave.skin>>
 <br>
 <<radiobutton "$tempSlave.skin" "pure white">> Pure White
+<<radiobutton "$tempSlave.skin" "ivory">> Ivory
+<<radiobutton "$tempSlave.skin" "white">> White
 <<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+<<radiobutton "$tempSlave.skin" "very pale">> Very Pale
 <<radiobutton "$tempSlave.skin" "pale">> Pale
 <<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
 <<radiobutton "$tempSlave.skin" "very fair">> Very Fair
 <<radiobutton "$tempSlave.skin" "fair">> Fair
-<<radiobutton "$tempSlave.skin" "white">> White
 <<radiobutton "$tempSlave.skin" "light">> Light
-<<radiobutton "$tempSlave.skin" "lightened">> Lightened
 <<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+<<radiobutton "$tempSlave.skin" "tan">> Tan
 <<radiobutton "$tempSlave.skin" "olive">> Olive
-<<radiobutton "$tempSlave.skin" "natural">> Natural
-<<radiobutton "$tempSlave.skin" "tanned">> Tanned
-<<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+<<radiobutton "$tempSlave.skin" "bronze">> Bronze
 <<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
 <<radiobutton "$tempSlave.skin" "dark">> Dark
+<<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+<<radiobutton "$tempSlave.skin" "beige">> Beige
+<<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
 <<radiobutton "$tempSlave.skin" "light brown">> Light Brown
 <<radiobutton "$tempSlave.skin" "brown">> Brown
 <<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 28cfaee1dc2..76f931109f0 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1286,21 +1286,24 @@
 	<<textbox "$tempSlave.skin" $tempSlave.skin>>
 	<br>
 	<<radiobutton "$tempSlave.skin" "pure white">> Pure White
+	<<radiobutton "$tempSlave.skin" "ivory">> Ivory
+	<<radiobutton "$tempSlave.skin" "white">> White
 	<<radiobutton "$tempSlave.skin" "extremely pale">> Extremely Pale
+	<<radiobutton "$tempSlave.skin" "very pale">> Very Pale
 	<<radiobutton "$tempSlave.skin" "pale">> Pale
 	<<radiobutton "$tempSlave.skin" "extremely fair">> Extremely Fair
 	<<radiobutton "$tempSlave.skin" "very fair">> Very Fair
 	<<radiobutton "$tempSlave.skin" "fair">> Fair
-	<<radiobutton "$tempSlave.skin" "white">> White
 	<<radiobutton "$tempSlave.skin" "light">> Light
-	<<radiobutton "$tempSlave.skin" "lightened">> Lightened
 	<<radiobutton "$tempSlave.skin" "light olive">> Light Olive
+	<<radiobutton "$tempSlave.skin" "tan">> Tan
 	<<radiobutton "$tempSlave.skin" "olive">> Olive
-	<<radiobutton "$tempSlave.skin" "natural">> Natural
-	<<radiobutton "$tempSlave.skin" "tanned">> Tanned
-	<<radiobutton "$tempSlave.skin" "bronzed">> Bronzed
+	<<radiobutton "$tempSlave.skin" "bronze">> Bronze
 	<<radiobutton "$tempSlave.skin" "dark olive">> Dark Olive
 	<<radiobutton "$tempSlave.skin" "dark">> Dark
+	<<radiobutton "$tempSlave.skin" "light beige">> Light Beige
+	<<radiobutton "$tempSlave.skin" "beige">> Beige
+	<<radiobutton "$tempSlave.skin" "dark beige">> Dark Beige
 	<<radiobutton "$tempSlave.skin" "light brown">> Light Brown
 	<<radiobutton "$tempSlave.skin" "brown">> Brown
 	<<radiobutton "$tempSlave.skin" "dark brown">> Dark Brown
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 47b6f0806c8..800c2f125d1 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -708,21 +708,24 @@ __''Player Character''__
 	<<options $PC.skin>>
 		Your skin tone is:
 		<<option "pure white" "Pure White" >>
+		<<option "ivory" "Ivory" >>
+		<<option "white" "White" >>
 		<<option "extremely pale" "Extremely Pale" >>
+		<<option "very pale" "Very Pale" >>
 		<<option "pale" "Pale" >>
 		<<option "extremely fair" "Extremely Fair" >>
 		<<option "very fair" "Very Fair" >>
 		<<option "fair" "Fair" >>
-		<<option "white" "White" >>
 		<<option "light" "Light" >>
-		<<option "lightened" "Lightened" >>
 		<<option "light olive" "Light Olive" >>
+		<<option "tan" "Tan" >>
 		<<option "olive" "Olive" >>
-		<<option "natural" "Natural" >>
-		<<option "tanned" "Tanned" >>
-		<<option "bronzed" "Bronzed" >>
+		<<option "bronze" "Bronze" >>
 		<<option "dark olive" "Dark Olive" >>
 		<<option "dark" "Dark" >>
+		<<option "light beige" "Light Beige" >>
+		<<option "beige" "Beige" >>
+		<<option "dark beige" "Dark Beige" >>
 		<<option "light brown" "Light Brown" >>
 		<<option "brown" "Brown" >>
 		<<option "dark brown" "Dark Brown" >>
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 4a70966ee50..712db6caeb6 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -213,25 +213,30 @@ window.generateGenetics = (function() {
 		let fatherSkin = 0;
 		let dadSkinIndex;
 		let skinToMelanin = {
-			"pure black": 21,
-			"ebony": 20,
-			"black": 19,
-			"dark brown": 18,
-			"brown": 17,
-			"light brown": 16,
-			"dark": 15,
-			"dark olive": 14,
-			"bronze": 13,
-			"tan": 11,
-			"olive": 10,
-			"light olive": 9,
-			"light": 8,
-			"white": 7,
-			"fair": 6,
-			"very fair": 5,
-			"extremely fair": 4,
-			"pale": 3,
-			"extremely pale": 2,
+			"pure black": 25,
+			"ebony": 24,
+			"black": 23,
+			"dark brown": 22,
+			"brown": 21,
+			"light brown": 20,
+			"dark beige": 19,
+			"beige": 18,
+			"light beige": 17,
+			"dark": 16,
+			"dark olive": 15,
+			"bronze": 14,
+			"olive": 13,
+			"tan": 12,
+			"light olive": 11,
+			"light": 10,
+			"fair": 9,
+			"very fair": 8,
+			"extremely fair": 7,
+			"pale": 6,
+			"very pale": 5,
+			"extremely pale": 4,
+			"white": 3,
+			"ivory": 2,
 			"pure white": 1
 		};
 		let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 13) : 8;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index e476f2814d6..7d49049dce1 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -3642,10 +3642,31 @@ window.rulesAssistantOptions = (function() {
 			const items = [
 				["no default setting"],
 				["natural"],
+				["pure white"],
+				["ivory"],
+				["white"],
+				["extremely pale"],
+				["very pale"],
 				["pale"],
-				["lightened"],
-				["tanned"],
+				["extremely fair"],
+				["very fair"],
+				["fair"],
+				["light"],
+				["light olive"],
+				["tan"],
+				["olive"],
+				["bronze"],
+				["dark olive"],
 				["dark"],
+				["light beige"],
+				["beige"],
+				["dark beige"],
+				["light brown"],
+				["brown"],
+				["dark brown"],
+				["black"],
+				["ebony"],
+				["pure black"],
 				["dyed red"],
 				["dyed green"],
 				["dyed blue"],
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8463aa73159..df765b77fd7 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -1844,6 +1844,9 @@ window.SlaveSummaryUncached = (function(){
 			case "extremely pale":
 				r += `E. Pal`;
 				break;
+			case "very pale":
+				r += `V. Pal`;
+				break;
 			case "light brown":
 				r += `L. Br`;
 				break;
@@ -1856,16 +1859,16 @@ window.SlaveSummaryUncached = (function(){
 			case "dark olive":
 				r += `D. Oli`;
 				break;
-			case "lightened":
-				r += `Ltnd`;
+			case "light beige":
+				r += `L. Bei`;
 				break;
-			case "tanned":
-				r += `Tan`;
+			case "dark beige":
+				r += `D. Bei`;
 				break;
-			case "natural":
-				r += `Nat`;
+			case "tan":
+				r += `Tan`;
 				break;
-			case "bronzed":
+			case "bronze":
 				r += `Bron`;
 				break;
 			case "ebony":
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index dc74809f388..101891bd958 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -417,7 +417,7 @@
 /*martin's sibling*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "lightened", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
+<<set _HS.slaveName = "Yvonne", _HS.birthName = "Yvonne", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 24, _HS.physicalAge = 24, _HS.visualAge = 24, _HS.ovaryAge = 24, _HS.health = 20, _HS.devotion = 100, _HS.height = 190, _HS.eyeColor = "hazel", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "light", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 700, _HS.nipplesPiercing = 1, _HS.butt = 2, _HS.face = 55, _HS.vaginaLube = 1, _HS.clitPiercing = 3, _HS.clitSetting = "all", _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.attrXY = 40, _HS.fetish = "pregnancy">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
@@ -472,7 +472,7 @@
 
 <<if $seePreg != 0>>
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "lightened", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.combatSkill = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
+<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "light", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.lactationDuration = 4, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregType = 1, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.births = 1, _HS.birthsTotal = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.combatSkill = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.face = 0, _HS.intelligence = 0>>
 <<set $heroSlaves.push(_HS)>>
 <</if>>
 
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 23e4e74bb80..ad3a6c75621 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -125,7 +125,7 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "lightened", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
+<<set _HS.slaveName = "Aisha", _HS.birthName = "Aicha", _HS.genes = "XY", _HS.origin = "She sold herself into slavery to escape a life of boredom.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = 45, _HS.height = 155, _HS.heightImplant = -1, _HS.race = "middle eastern", _HS.override_Eye_Color = 1, _HS.eyeColor = "blue", _HS.override_H_Color = 1, _HS.override_Brow_H_Color = 1, _HS.override_Arm_H_Color = 1, _HS.override_Pubic_H_Color = 1, _HS.hColor = "peachy fading into a red ombre at the bottom", _HS.eyebrowHColor = "red", _HS.pubicHColor = "red", _HS.underArmHColor = "red", _HS.skin = "light", _HS.hLength = 30, _HS.hStyle = "shoulder-length in a hime cut", _HS.waist = -55, _HS.boobs = 250, _HS.butt = 3.5, _HS.face = 55, _HS.faceImplant = 65, _HS.vagina = -1, _HS.preg = -2, _HS.clitPiercing = 3, _HS.anus = 1, _HS.dick = 5, _HS.dickTat = "flowers", _HS.prostate = 1, _HS.balls = 2, _HS.scrotum = 2, _HS.anusPiercing = 1, _HS.anusTat = "flowers", _HS.brand = "your initials", _HS.brandLocation = "back", _HS.earPiercing = 1, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.entertainSkill = 15, _HS.clothes = "a comfortable bodysuit", _HS.collar = "pretty jewelry", _HS.shoes = "heels", _HS.intelligence = -30, _HS.attrXX = 40, _HS.attrXY = 40, _HS.customTat = "She has tattooed petals trailing from the nape of her neck down her back, ending between her butt cheeks.", _HS.customDesc = "Her red pubic hair is waxed into the shape of a heart. She has bright blue eyeshadow on her bottom lids.", _HS.pubicHStyle = "waxed">>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 7daf8168e41..195a618f2f8 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -736,28 +736,31 @@ __You are customizing this slave:__
 <br>
 <<options $activeSlave.skin>>
 	''Skin color:'' $activeSlave.skin
-	<<option "pure white"     "Pure White">>
-	<<option "extremely pale" "Extremely Pale">>
-	<<option "pale"           "Pale">>
-	<<option "extremely fair" "Extremely Fair">>
-	<<option "very fair"      "Very Fair">>
-	<<option "fair"           "Fair">>
-	<<option "white"          "White">>
-	<<option "light"          "Light">>
-	<<option "lightened"      "Lightened">>
-	<<option "light olive"    "Light Olive">>
-	<<option "olive"          "Olive">>
-	<<option "natural"        "Natural">>
-	<<option "tanned"         "Tanned">>
-	<<option "bronzed"        "Bronzed">>
-	<<option "dark olive"     "Dark Olive">>
-	<<option "dark"           "Dark">>
-	<<option "light brown"    "Light Brown">>
-	<<option "brown"          "Brown">>
-	<<option "dark brown"     "Dark Brown">>
-	<<option "black"          "Black">>
-	<<option "ebony"          "Ebony">>
-	<<option "pure black"     "Pure Black">>
+	<<option "pure white"		"Pure White">>
+	<<option "ivory"			"Ivory">>
+	<<option "white"			"White">>
+	<<option "extremely pale"	"Extremely Pale">>
+	<<option "very pale"		"Very Pale">>
+	<<option "pale"				"Pale">>
+	<<option "extremely fair"	"Extremely Fair">>
+	<<option "very fair"		"Very Fair">>
+	<<option "fair"				"Fair">>
+	<<option "light"			"Light">>
+	<<option "light	olive"		"Light Olive">>
+	<<option "tan"				"Tan">>
+	<<option "olive"			"Olive">>
+	<<option "bronze"			"Bronze">>
+	<<option "dark olive"		"Dark Olive">>
+	<<option "dark"				"Dark">>
+	<<option "light beige"		"Light Beige">>
+	<<option "beige"			"Beige" >>
+	<<option "dark beige"		"Dark Beige">>
+	<<option "light brown"		"Light Brown">>
+	<<option "brown"			"Brown">>
+	<<option "dark brown"		"Dark Brown">>
+	<<option "black"			"Black">>
+	<<option "ebony"			"Ebony">>
+	<<option "pure black"		"Pure Black">>
 	<<option>>
 		<<textbox2 "$activeSlave.skin" $activeSlave.skin "Starting Girls">>
 <</options>>
-- 
GitLab