diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 592f0142ad90bbb87905326e5c9f92afd589eec2..44a66240cdf2cc3e4122d97c4d71a93d580cffab 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -90,8 +90,8 @@ App.SlaveAssignment.choosesOwnClothes = (function() {
 	 * @returns {{text:string, clothes:string}}
 	 */
 	function todaysOutfit(slave) {
+		/** @type {Array<FC.FutureSociety>} */
 		const clothing = [];
-		let chosenClothing;
 		const wardrobeAssignment = [];
 		const wardrobeFS = [];
 		const wardrobeTastes = [];
@@ -103,97 +103,98 @@ App.SlaveAssignment.choosesOwnClothes = (function() {
 			} else {
 				clothing.push("panties");
 				if (V.arcologies[0].FSEgyptianRevivalist > 0) {
-					clothing.push("egyptian");
+					clothing.push("FSEgyptianRevivalist");
 				} else if (V.arcologies[0].FSRomanRevivalist > 0) {
-					clothing.push("roman");
+					clothing.push("FSRomanRevivalist");
 				} else if (V.arcologies[0].FSAztecRevivalist > 0) {
-					clothing.push("aztec");
+					clothing.push("FSAztecRevivalist");
 				} else if (V.arcologies[0].FSEdoRevivalist > 0) {
-					clothing.push("edo");
+					clothing.push("FSEdoRevivalist");
 				} else if (V.arcologies[0].FSArabianRevivalist > 0) {
-					clothing.push("arabic");
+					clothing.push("FSArabianRevivalist");
 				} else if (V.arcologies[0].FSChineseRevivalist > 0) {
-					clothing.push("chinese");
+					clothing.push("FSChineseRevivalist");
 				}
 				if (V.arcologies[0].FSGenderFundamentalist > 0) {
-					clothing.push("genderFund");
+					clothing.push("FSGenderFundamentalist");
 				}
 				if (V.arcologies[0].FSPaternalist > 0) {
-					clothing.push("paternalist");
+					clothing.push("FSPaternalist");
 				} else if (V.arcologies[0].FSDegradationist > 0) {
-					clothing.push("degradationist");
+					clothing.push("FSDegradationist");
 				}
 				if (V.arcologies[0].FSMaturityPreferentialist > 0) {
-					clothing.push("mature");
+					clothing.push("FSMaturityPreferentialist");
 				} else if (V.arcologies[0].FSYouthPreferentialist > 0) {
-					clothing.push("youth");
+					clothing.push("FSYouthPreferentialist");
 				}
 				if (V.arcologies[0].FSPhysicalIdealist > 0) {
-					clothing.push("physicalIdealist");
+					clothing.push("FSPhysicalIdealist");
 				}
 				if (V.arcologies[0].FSPastoralist > 0) {
-					clothing.push("pastoralist");
+					clothing.push("FSPastoralist");
 				}
 				if (V.arcologies[0].FSBodyPurist > 0) {
-					clothing.push("bodyPurist");
+					clothing.push("FSBodyPurist");
 				}
 				if (V.arcologies[0].FSSlaveProfessionalism > 0) {
-					clothing.push("professional");
+					clothing.push("FSSlaveProfessionalism");
 				} else if (V.arcologies[0].FSIntellectualDependency > 0) {
-					clothing.push("bimbo");
+					clothing.push("FSIntellectualDependency");
 				}
-				chosenClothing = jsEither(clothing);
+				/** @type {FC.FutureSociety} */
+				const chosenClothing = jsEither(clothing);
 				switch (chosenClothing) {
-					case "egyptian":
+					case "FSEgyptianRevivalist":
 						selection = {text: `${he} commonly sees others wearing nothing but jewelry and is drawn to doing so ${himself}.`, clothes: "slutty jewelry"};
 						break;
-					case "roman":
+					case "FSRomanRevivalist":
 						selection = {text: `${he} commonly sees others wearing togas and is drawn to doing so ${himself}.`, clothes: "a toga"};
 						break;
-					case "aztec":
+					case "FSAztecRevivalist":
 						selection = {text: `${he} commonly sees others wearing huipils and is drawn to doing so ${himself}.`, clothes: "a huipil"};
 						break;
-					case "edo":
+					case "FSEdoRevivalist":
 						selection = {text: `${he} commonly sees others wearing kimonos and is drawn to doing so ${himself}.`, clothes: "a kimono"};
 						break;
-					case "arabic":
+					case "FSArabianRevivalist":
 						selection = {text: `${he} commonly sees others wearing silk and is drawn to doing so ${himself}.`, clothes: "harem gauze"};
 						break;
-					case "chinese":
+					case "FSChineseRevivalist":
 						selection = {text: `${he} commonly sees others wearing qipaos and is drawn to doing so ${himself}.`, clothes: "a slutty qipao"};
 						break;
-					case "genderFund":
+					case "FSGenderFundamentalist":
 						if (jsRandom(1, 2) === 1) {
 							selection = {text: `${he} commonly sees cheerleaders around and instinctively follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
 						} else {
 							selection = {text: `${he} commonly sees bunnies around and instinctively follows along.`, clothes: "a bunny outfit"};
 						}
 						break;
-					case "paternalist":
+					case "FSPaternalist":
 						selection = {text: `${he} commonly sees others wearing normal clothing and is drawn to doing so ${himself}.`, clothes: "conservative clothing"};
 						break;
-					case "degradationist":
+					case "FSDegradationist":
 						selection = {text: `${he} commonly sees others wearing chains and is drawn to doing so ${himself}.`, clothes: jsEither(["chains", "shibari ropes", "uncomfortable straps"])};
 						break;
-					case "mature":
+					case "FSMaturityPreferentialist":
 						selection = {text: `${he} commonly sees others wearing suits and is drawn to doing so ${himself}.`, clothes: jsEither(["a nice maid outfit", "nice business attire", "slutty business attire"])};
 						break;
-					case "youth":
+					case "FSYouthPreferentialist":
 						selection = {text: `${he} commonly sees schoolgirls around and instinctively follows along.`, clothes: jsEither(["a cheerleader outfit", "a schoolgirl outfit"])};
 						break;
-					case "physicalIdealist":
+					case "FSPhysicalIdealist":
 						selection = {text: `${he} commonly sees naked girls around and seldom realizes they are coated in oil.`, clothes: jsEither(["body oil", "no clothing", "no clothing"])};
 						break;
-					case "pastoralist":
+					case "FSPastoralist":
 						selection = {text: `${he} commonly sees cowgirls around and instinctively follows along.`, clothes: "Western clothing"};
 						break;
-					case "bodyPurist":
+					case "FSBodyPurist":
 						selection = {text: `${he} commonly sees others wearing tight, form-fitting clothes and is drawn to doing so ${himself}.`, clothes: jsEither(["a comfortable bodysuit", "a halter top dress", "a leotard", "a leotard", "a slave gown", "a string bikini", "clubslut netting", "restrictive latex"])};
 						break;
-					case "professional":
+					case "FSSlaveProfessionalism":
 						selection = {text: `${he} commonly sees others wearing complicated clothing and is drawn to doing so ${himself}.`, clothes: jsEither(["a slutty maid outfit", "slutty business attire", "a halter top dress", "a courtesan dress"])};
 						break;
-					case "bimbo":
+					case "FSIntellectualDependency":
 						selection = {text: `${he} commonly sees others showing skin is drawn to doing so ${himself}.`, clothes: jsEither(["a bimbo outfit", "a slutty outfit", "a string bikini", "attractive lingerie", "clubslut netting", "slutty jewelry", "no clothing"])};
 						break;
 					default: