diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index f33c019ab65e306f1afd27d16a95aaf279f3ecd8..0227136241d63723cf033b32b04c8829cd5d8e06 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1325,7 +1325,7 @@ App.Art.vectorArtElement = (function() {
 				T.glassesColor = slave.glassesColor || "#010101"; /* use custom color or default */
 			}
 
-			if (hasAnyEye(slave)) {
+			if (hasAnyEyes(slave)) {
 				T.eyeColor = extractColor(hasLeftEye(slave) ? getLeftEyeColor(slave) : getRightEyeColor(slave), 1);
 			} else {
 				T.eyeColor = extractColor("brown");
@@ -1674,7 +1674,12 @@ App.Art.vectorArtElement = (function() {
 			T.pubicHairColour = extractColor(slave.pubicHColor);
 			T.underarmHairColour = extractColor(slave.underArmHColor);
 			T.eyebrowHairColour = extractColor(slave.eyebrowHColor);
-			T.sclerae = extractColor(slave.sclerae);
+			if (hasAnyEyes(slave)) {
+				T.sclerae = extractColor(hasLeftEye(slave) ? slave.eye.left.sclera : slave.eye.right.sclera);
+
+			} else {
+				T.sclerae = extractColor("white");
+			}
 		}
 
 		function setShoeColor() {
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 10fc4e70773bfcbe9984cc00b16d0f8f17496cfe..72b7930972e2a8ebb475f9dc5e10105882eb2451 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -15762,7 +15762,6 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) {
 	child.pubertyXX = 1,
 	child.pubicHColor = "black",
 	child.pubicHStyle = "bushy",
-	child.pupil = "circular",
 	child.readyOva = 0,
 	child.rearAccessory = "none",
 	child.relationship = 0,
@@ -15773,7 +15772,6 @@ App.Facilities.Nursery.infantToChild = function infantToChild(child) {
 	child.rivalryTarget = 0,
 	child.rudeTitle = 0,
 	child.scars = 0,
-	child.sclerae = "white",
 	child.scrotum = 0,
 	child.shoes = "none",
 	child.shoulders = 0,
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index df3e75507086b13760b6d5be077ea7130ea7496e..170d82a3094a42eb34e4f9f2fc139c47f079af91 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -348,7 +348,8 @@
 /*Added origin, reduced age, fetish was 'arrogant', changed it to quirk, fixed customdesc syntax. -BoneyM*/
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "Bitch", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = -75, _HS.height = 155, _HS.eye.origColor = "dark", _HS.pupil = "almond-shaped", _HS.origHColor = "dark", _HS.origSkin = "pale", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.oral = 35, _HS.intelligence = -60, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "$He has a heart shaped face and many scars.", _HS.faceShape = "cute", _HS.hips = 3, _HS.markings = "beauty">>
+<<set _HS.slaveName = "Bitch", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.health = -20, _HS.devotion = -75, _HS.height = 155, _HS.eye.origColor = "dark", _HS.origHColor = "dark", _HS.origSkin = "pale", _HS.waist = -55, _HS.boobs = 300, _HS.butt = 5, _HS.lips = 35, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vaginaLube = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.eyebrowPiercing = 1, _HS.skill.oral = 35, _HS.intelligence = -60, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.custom.desc = "$He has a heart shaped face and many scars.", _HS.faceShape = "cute", _HS.hips = 3, _HS.markings = "beauty">>
+<<run setEyeColorFull(_HS, "", "almond-shaped", "", "both")>>
 <<set $heroSlaves.push(_HS)>>
 /*Fixed customdesc syntax, changed eye color, added piercings, increased waist -BoneyM*/
 
diff --git a/src/npc/databases/ddSlavesDatabase.tw b/src/npc/databases/ddSlavesDatabase.tw
index 2501cc2ef3ddd9e7e02e776b9d355a7e9cc27b6c..f8fe5db05176dd153c0202953fc59b81c249f371 100644
--- a/src/npc/databases/ddSlavesDatabase.tw
+++ b/src/npc/databases/ddSlavesDatabase.tw
@@ -145,7 +145,8 @@
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
-<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1, _HS.pupil = "demonic">>
+<<set _HS.slaveName = "'Demon Whore' Yuzuki", _HS.birthName = "Yuri", _HS.genes = "XY", _HS.origin = "$His origins are unknown, but rumor has it that $he is a literal demon.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 60, _HS.devotion = 90.4, _HS.muscles = 20, _HS.height = 190, _HS.nationality = "Japanese", _HS.race = "asian", _HS.eye.origColor = "green", _HS.origHColor = "black", _HS.pubicHColor = "black", _HS.origSkin = "pale", _HS.hStyle = "long", _HS.pubicHStyle = "in a strip", _HS.waist = -100, _HS.boobs = 10000, _HS.boobsImplant = 4800, _HS.areolae = 2, _HS.lactation = 2, _HS.lactationDuration = 2, _HS.butt = 9, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 35, _HS.vagina = 1, _HS.clitPiercing = 3, _HS.clitSetting = "humiliation", _HS.anus = 1, _HS.dick = 5, _HS.prostate = 1, _HS.balls = 5, _HS.scrotum = 4, _HS.ovaries = 1, _HS.makeup = 2, _HS.nails = 2, _HS.skill.vaginal = 15, _HS.skill.oral = 100, _HS.skill.anal = 15, _HS.skill.whoring = 15, _HS.skill.entertainment = 15, _HS.skill.combat = 1, _HS.clothes = "a string bikini", _HS.collar = "pretty jewelry", _HS.shoes = "boots", _HS.attrXX = 40, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.fetishKnown = 1>>
+<<run setEyeColorFull(_HS, "", "demonic", "", "both")>>
 <<set $heroSlaves.push(_HS)>>
 
 <<set _HS = App.Entity.SlaveState.makeSkeleton()>>
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index 40e923713908b89ce24b2d7f430862f7cc38bb2e..d4c2c5715ae8b81aa00fc199a9a84f10480754f3 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -22,9 +22,15 @@
 <br>''Nationality:'' <<textbox "$activeSlave.nationality" $activeSlave.nationality "More customization options">> //This will not alter name or race.//
 <br>''Ethnicity:'' <<textbox "$activeSlave.race" $activeSlave.race "More customization options">> //This will not apply phenotypes.//
 <br>''Hair color:'' <<textbox "$activeSlave.origHColor" $activeSlave.origHColor "More customization options">> //This will also set eyebrow, pubic, and underarm hair color.//
-<br>''Eye color:'' <<textbox "$activeSlave.origEye" $activeSlave.origEye "More customization options">>
-<br>''Pupil shape:'' <<textbox "$activeSlave.pupil" $activeSlave.pupil "More customization options">>
-<br>''Sclera color:'' <<textbox "$activeSlave.sclerae" $activeSlave.sclerae "More customization options">>
+<br>''Eye color:'' <<textbox "$activeSlave.eye.origColor" $activeSlave.eye.origColor "More customization options">>
+<<if def $pupil_temp>>
+	<<set $activeSlave.eye.left.pupil = $pupil_temp, $activeSlave.eye.right.pupil = $pupil_temp, delete $pupil_temp>>
+<</if>>
+<br>''Pupil shape:'' <<textbox "$pupil_temp" $activeSlave.eye.left.pupil "More customization options">>
+<<if def $sclerae_temp>>
+	<<set $activeSlave.eye.left.sclera = $sclerae_temp, $activeSlave.eye.right.sclera = $sclerae_temp, delete $sclerae_temp>>
+<</if>>
+<br>''Sclera color:'' <<textbox "$sclerae_temp" $activeSlave.eye.left.sclera "More customization options">>
 <br>Custom tattoo: <<textbox "$activeSlave.custom.tattoo" $activeSlave.custom.tattoo "More customization options">> //Use complete, capitalized and punctuated sentences.//
 <br>Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> //Use complete, capitalized and punctuated sentences.//
 <br>