diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index a1ae95032148049df671ac078bb20ec5d73a7f82..11a4116e3d8df59fa7a7444e0e59b9a122549610 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -261,14 +261,6 @@ App.Data.misc = {
 	filterRaces: ["Amerindian", "Asian", "Black", "Indo-Aryan", "Latina", "Malay", "Middle Eastern", "Mixed Race", "Pacific Islander", "Semitic", "Southern European", "White"],
 	filterRacesLowercase: ["amerindian", "asian", "black", "indo-aryan", "latina", "malay", "middle eastern", "mixed race", "pacific islander", "semitic", "southern european", "white"],
 	filterRegions: ["Africa", "Asia", "Australia", "Europe", "Middle East", "North America", "South America"],
-	naturalSkins: ["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "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"],
-	dyedSkins: ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"],
-	naturalNippleColors: ["black", "brown", "dark brown", "ebony", "ivory", "light brown", "pale pink", "pink"],
-	eyebrowStyles: new Set(["shaved", "straight", "rounded", "natural", "slanted inwards", "slanted outwards", "high-arched", "elongated", "shortened", "curved"]),
-	eyebrowFullness: new Set(["pencil-thin", "thin", "threaded", "natural", "tapered", "thick", "bushy"]),
-	pubicStyles: new Set(["waxed", "in a strip", "neat", "bushy", "bushy in the front and neat in the rear", "very bushy"]),
-	armpitStyles: new Set(["waxed", "shaved", "neat", "bushy"]),
-	hornColor: new Set(["golden", "copper", "red", "deep red", "green", "pink", "dark brown", "brown", "burgundy", "jet black", "black", "grey", "silver", "white", "blue-violet", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "blazing red", "neon green", "neon blue", "neon pink"]),
 
 	/* START Custom Nationalities region filter */
 	/* Not currently weighted, but will accept weights */
diff --git a/js/003-data/slaveMods.js b/js/003-data/slaveMods.js
index 4f5deee28451931127bc72def9764c48bea0f140..752667ac7a317042ae7a67a39f50937cab505ae7 100644
--- a/js/003-data/slaveMods.js
+++ b/js/003-data/slaveMods.js
@@ -438,3 +438,12 @@ App.Medicine.Modification.eyeShape = [
 	{value: "vacant"},
 	{value: "wide-eyed"}
 ];
+
+App.Medicine.Modification.naturalSkins = ["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "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"];
+App.Medicine.Modification.dyedSkins = ["camouflage patterned", "dyed blue", "dyed gray", "dyed green", "dyed pink", "dyed red", "tiger striped"];
+App.Medicine.Modification.naturalNippleColors = ["black", "brown", "dark brown", "ebony", "ivory", "light brown", "pale pink", "pink"];
+App.Medicine.Modification.eyebrowStyles = new Set(["shaved", "straight", "rounded", "natural", "slanted inwards", "slanted outwards", "high-arched", "elongated", "shortened", "curved"]);
+App.Medicine.Modification.eyebrowFullness = new Set(["pencil-thin", "thin", "threaded", "natural", "tapered", "thick", "bushy"]);
+App.Medicine.Modification.pubicStyles = new Set(["waxed", "in a strip", "neat", "bushy", "bushy in the front and neat in the rear", "very bushy"]);
+App.Medicine.Modification.armpitStyles = new Set(["waxed", "shaved", "neat", "bushy"]);
+App.Medicine.Modification.hornColor = new Set(["golden", "copper", "red", "deep red", "green", "pink", "dark brown", "brown", "burgundy", "jet black", "black", "grey", "silver", "white", "blue-violet", "purple", "dark orchid", "sea green", "green-yellow", "dark blue", "blazing red", "neon green", "neon blue", "neon pink"]);
diff --git a/src/events/intro/pcAppearance.js b/src/events/intro/pcAppearance.js
index 96b5024ccaee1d0cc7e6bd95e6ca3d56a2f23e11..04e606a16c1e5c9fc4d92af91bf7a6b4c55c9182 100644
--- a/src/events/intro/pcAppearance.js
+++ b/src/events/intro/pcAppearance.js
@@ -14,11 +14,11 @@ App.UI.Player.appearance = function(options) {
 	}
 
 	options.addOption("Your skin tone is", "skin", V.PC).showTextBox()
-		.addValueList(makeAList(setup.naturalSkins));
+		.addValueList(makeAList(App.Medicine.Modification.naturalSkins));
 
 	if (V.cheatMode) {
 		options.addOption("Your genetic skin tone is", "origSkin", V.PC).showTextBox()
-			.addValueList(makeAList(setup.naturalSkins));
+			.addValueList(makeAList(App.Medicine.Modification.naturalSkins));
 	}
 
 	options.addOption("Your body", "markings", V.PC)
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index ab89dc939e74914346c9a72b613fac8ab6265f47..bebe975fa5e5904c660702a33beb88604bbc0535 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -112,7 +112,7 @@ App.UI.salon = function(slave, cheat = false) {
 		const options = new App.UI.OptionsGroup();
 
 		const option = options.addOption(`Set the color of ${his} ${slave.horn}`, "hornColor", slave);
-		for (const hornColor of App.Data.misc.hornColor) {
+		for (const hornColor of App.Medicine.Modification.hornColor) {
 			option.addValue(capFirstChar(hornColor), hornColor, billMod);
 		}
 
@@ -161,13 +161,13 @@ App.UI.salon = function(slave, cheat = false) {
 		let comment = [];
 
 		let option = options.addOption(`${His} skin is ${slave.skin}.`, "skin", slave);
-		if (App.Data.misc.dyedSkins.includes(slave.skin)) {
+		if (App.Medicine.Modification.dyedSkins.includes(slave.skin)) {
 			option.addValue("Remove coloring", slave.origSkin, billMod);
 		} else if (((slave.skin === "sun tanned") || (slave.skin === "spray tanned"))) {
 			option.addValue("Remove tanning", slave.origSkin, billMod);
 		}
 
-		if (!App.Data.misc.dyedSkins.includes(slave.skin)) {
+		if (!App.Medicine.Modification.dyedSkins.includes(slave.skin)) {
 			if (slave.skin === "sun tanned" || slave.skin === "spray tanned") {
 				comment.push(`${His} skin tanning must be removed before any advanced procedure to change ${his} skin color.`);
 			} else {
@@ -200,7 +200,7 @@ App.UI.salon = function(slave, cheat = false) {
 		}
 
 		option = options.addOption(`Dye or paint`, "skin", slave);
-		for (const dye of App.Data.misc.dyedSkins) {
+		for (const dye of App.Medicine.Modification.dyedSkins) {
 			option.addValue(capFirstChar(dye), dye, billMod);
 		}
 		option.pulldown();
@@ -262,14 +262,14 @@ App.UI.salon = function(slave, cheat = false) {
 
 			// Style
 			option = options.addOption(`Style ${his} eyebrow hair`, "eyebrowHStyle", slave);
-			for (const fullness of App.Data.misc.eyebrowStyles) {
+			for (const fullness of App.Medicine.Modification.eyebrowStyles) {
 				option.addValue(capFirstChar(fullness), fullness, billMod);
 			}
 			option.pulldown();
 
 			// Fullness
 			option = options.addOption(`Shape ${his} eyebrow hair`, "eyebrowFullness", slave);
-			for (const fullness of App.Data.misc.eyebrowFullness) {
+			for (const fullness of App.Medicine.Modification.eyebrowFullness) {
 				option.addValue(capFirstChar(fullness), fullness, billMod);
 			}
 			option.pulldown();
@@ -309,7 +309,7 @@ App.UI.salon = function(slave, cheat = false) {
 
 			// Style
 			option = options.addOption(`Style ${his} pubic hair`, "pubicHStyle", slave);
-			for (const fullness of App.Data.misc.pubicStyles) {
+			for (const fullness of App.Medicine.Modification.pubicStyles) {
 				option.addValue(capFirstChar(fullness), fullness, billMod);
 			}
 			option.pulldown();
@@ -344,7 +344,7 @@ App.UI.salon = function(slave, cheat = false) {
 
 			// Style
 			option = options.addOption(`Style ${his} armpit hair`, "underArmHStyle", slave);
-			for (const fullness of App.Data.misc.armpitStyles) {
+			for (const fullness of App.Medicine.Modification.armpitStyles) {
 				option.addValue(capFirstChar(fullness), fullness, billMod);
 			}
 			option.pulldown();
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7dfd93909563c160256ad570f1320dd9f5f07b62..ccc8b24aa8fafc3d015748080a818e4239f2212b 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -3029,7 +3029,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 	class HornColorList extends ListSelector {
 		constructor() {
-			const pairs = Array.from(App.Data.misc.hornColor, color => [color]);
+			const pairs = Array.from(App.Medicine.Modification.hornColor, color => [color]);
 			super("Horn color", pairs);
 			this.setValue(current_rule.set.hornColor);
 			this.onchange = (value) => current_rule.set.hornColor = value;
@@ -3056,7 +3056,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 	class EyebrowStyleList extends ListSelector {
 		constructor() {
-			const pairs = Array.from(App.Data.misc.eyebrowStyles, style => [style]);
+			const pairs = Array.from(App.Medicine.Modification.eyebrowStyles, style => [style]);
 			super("Eyebrow style", pairs);
 			this.setValue(current_rule.set.eyebrowHStyle);
 			this.onchange = (value) => current_rule.set.eyebrowHStyle = value;
@@ -3065,7 +3065,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 	class EyebrowFullnessList extends ListSelector {
 		constructor() {
-			const pairs = Array.from(App.Data.misc.eyebrowFullness, fullness => [fullness]);
+			const pairs = Array.from(App.Medicine.Modification.eyebrowFullness, fullness => [fullness]);
 			super("Eyebrow fullness", pairs);
 			this.setValue(current_rule.set.eyebrowFullness);
 			this.onchange = (value) => current_rule.set.eyebrowFullness = value;
@@ -3096,7 +3096,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 	class PubicHairStyleList extends ListSelector {
 		constructor() {
-			const pairs = Array.from(App.Data.misc.pubicStyles, style => [style]);
+			const pairs = Array.from(App.Medicine.Modification.pubicStyles, style => [style]);
 			super("Pubic hairstyle", pairs);
 			this.setValue(current_rule.set.pubicHStyle);
 			this.onchange = (value) => current_rule.set.pubicHStyle = value;
@@ -3114,7 +3114,7 @@ globalThis.rulesAssistantOptions = (function() {
 
 	class ArmpitHairStyleList extends ListSelector {
 		constructor() {
-			const pairs = Array.from(App.Data.misc.armpitStyles, style => [style]);
+			const pairs = Array.from(App.Medicine.Modification.armpitStyles, style => [style]);
 			super("Underarm hair style", pairs);
 			this.setValue(current_rule.set.underArmHStyle);
 			this.onchange = (value) => current_rule.set.underArmHStyle = value;
@@ -3966,7 +3966,7 @@ globalThis.rulesAssistantOptions = (function() {
 				["pure black"],
 				["sun tanned"],
 				["spray tanned"],
-				...App.Data.misc.dyedSkins
+				...App.Medicine.Modification.dyedSkins
 			];
 			super("Dye or tan skin", items);
 			this.setValue(current_rule.set.skinColor);
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index febd84b8831a2472c3d0b5fcd362fba36b1013ac..779c965102fff7ef801041666187948cecb7d077 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -2577,7 +2577,7 @@ globalThis.randomRaceHair = function(raceName) {
  * @returns {number}
  */
 globalThis.skinToneLevel = function(skinTone) {
-	if (!setup.naturalSkins.includes(skinTone)) {
+	if (!App.Medicine.Modification.naturalSkins.includes(skinTone)) {
 		return undefined;
 	}
 	const skinToMelanin = {
@@ -2617,7 +2617,7 @@ globalThis.skinToneLevel = function(skinTone) {
  * @returns {string}
  */
 globalThis.changeSkinTone = function(skin, value) {
-	if (!setup.naturalSkins.includes(skin)) {
+	if (!App.Medicine.Modification.naturalSkins.includes(skin)) {
 		return skin;
 	}
 	const skinToMelanin = {
@@ -2670,7 +2670,7 @@ globalThis.changeSkinTone = function(skin, value) {
  * @returns {number}
  */
 globalThis.nippleColorLevel = function(color) {
-	if (!setup.naturalNippleColors.includes(color)) {
+	if (!App.Medicine.Modification.naturalNippleColors.includes(color)) {
 		return undefined;
 	}
 	const nippleColor = {
diff --git a/src/markets/specificMarkets/customSlaveMarket.js b/src/markets/specificMarkets/customSlaveMarket.js
index 16c09e908488c3e92ab4e2bfc453ea1bd37cc6c1..5838770da2fdae91ad4f50d3a54eb3143e8c507f 100644
--- a/src/markets/specificMarkets/customSlaveMarket.js
+++ b/src/markets/specificMarkets/customSlaveMarket.js
@@ -349,7 +349,7 @@ App.Markets["Custom Slave"] = function() {
 		const choices = new Map([
 			["left natural", "Left natural"]
 		]);
-		for (const skin of App.Data.misc.naturalSkins) {
+		for (const skin of App.Medicine.Modification.naturalSkins) {
 			choices.set(skin, capFirstChar(skin));
 		}
 
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index bc3ca37031738e907fb72e9831c5b55700323280..266ac82a3d89fda3428ec704e5af1ec552912de9 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -362,7 +362,7 @@ from your victim.
 	<</if>>
 <</if>>
 
-<<if (setup.dyedSkins.includes(getSlave($AS).skin))>>
+<<if (App.Medicine.Modification.dyedSkins.includes(getSlave($AS).skin))>>
 	$His <<= getSlave($AS).skin>><<if $seeRace == 1>>, <<= getSlave($AS).race>><</if>> ass barely shows the spanking.
 <<elseif (skinToneLevel(getSlave($AS)) < 5)>>
 	$His <<= getSlave($AS).skin>><<if $seeRace == 1>>, <<= getSlave($AS).race>><</if>> ass shows the spanking extremely well.