diff --git a/src/js/wardrobeUse.js b/src/js/wardrobeUse.js
index 6e112b8b5195236906d2a0f1fc5d18b49b2a55e9..da49518a98afc61a2e04f7816afd4b5d1add18aa 100644
--- a/src/js/wardrobeUse.js
+++ b/src/js/wardrobeUse.js
@@ -12,123 +12,26 @@ App.UI.Wardrobe.clothes = function(slave) {
 		} = getPronouns(slave);
 
 	let choiceOptionsArray= [];
+	choiceOptionsArray.push({text: `Let ${him} choose`, updateSlave: {clothes: `choosing her own clothes`}});
+
 	let niceOptionsArray= [];
 	let harshOptionsArray= [];
-	choiceOptionsArray.push({text: `Let ${him} choose`, updateSlave: {clothes: `choosing her own clothes`}});
 
-	// Nice options:
-	niceOptionsArray.push({text: `Apron`, updateSlave: {clothes: `an apron`}});
-	niceOptionsArray.push({text: `Ballgown`, updateSlave: {clothes: `a ball gown`}});
-	niceOptionsArray.push({text: `Bangles`, updateSlave: {clothes: `slutty jewelry`}});
-	niceOptionsArray.push({text: `Battlearmor`, updateSlave: {clothes: `battlearmor`}});
-	niceOptionsArray.push({text: `Battledress`, updateSlave: {clothes: `battledress`}});
-	niceOptionsArray.push({text: `Biyelgee costume`, updateSlave: {clothes: `a biyelgee costume`}});
-	niceOptionsArray.push({text: `Bodysuit`, updateSlave: {clothes: `a comfortable bodysuit`}});
-	niceOptionsArray.push({text: `Boyshorts`, updateSlave: {clothes: `boyshorts`}});
-	niceOptionsArray.push({text: `Bra`, updateSlave: {clothes: `a bra`}});
-	niceOptionsArray.push({text: `Burkini`, updateSlave: {clothes: `a burkini`}});
-	niceOptionsArray.push({text: `Burqa`, updateSlave: {clothes: `a burqa`}});
-	niceOptionsArray.push({text: `Button-up shirt and panties`, updateSlave: {clothes: `a button-up shirt and panties`}});
-	niceOptionsArray.push({text: `Button-up shirt`, updateSlave: {clothes: `a button-up shirt`}});
-	niceOptionsArray.push({text: `Cheerleader`, updateSlave: {clothes: `a cheerleader outfit`}});
-	niceOptionsArray.push({text: `Clubslut netting`, updateSlave: {clothes: `clubslut netting`}});
-	niceOptionsArray.push({text: `Cutoffs and a t-shirt`, updateSlave: {clothes: `cutoffs and a t-shirt`}});
-	niceOptionsArray.push({text: `Cutoffs`, updateSlave: {clothes: `cutoffs`}});
-	niceOptionsArray.push({text: `Cybersuit`, updateSlave: {clothes: `a cybersuit`}});
-	niceOptionsArray.push({text: `Dirndl`, updateSlave: {clothes: `a dirndl`}});
-	niceOptionsArray.push({text: `Fallen nun`, updateSlave: {clothes: `a fallen nuns habit`}});
-	niceOptionsArray.push({text: `Gothic lolita dress`, updateSlave: {clothes: `a gothic lolita dress`}});
-	niceOptionsArray.push({text: `Haltertop dress`, updateSlave: {clothes: `a halter top dress`}});
-	niceOptionsArray.push({text: `Hanbok`, updateSlave: {clothes: `a hanbok`}});
-	niceOptionsArray.push({text: `Hijab and abaya`, updateSlave: {clothes: `a hijab and abaya`}});
-	niceOptionsArray.push({text: `Hijab and blouse`, updateSlave: {clothes: `a hijab and blouse`}});
-	niceOptionsArray.push({text: `Jeans`, updateSlave: {clothes: `jeans`}});
-	niceOptionsArray.push({text: `Kitty lingerie`, updateSlave: {clothes: `kitty lingerie`}});
-	niceOptionsArray.push({text: `Ku Klux Klan robe (nice)`, updateSlave: {clothes: `a klan robe`}});
-	niceOptionsArray.push({text: `Ku Klux Klan robe (slutty)`, updateSlave: {clothes: `a slutty klan robe`}});
-	niceOptionsArray.push({text: `Latex catsuit`, updateSlave: {clothes: `a latex catsuit`}});
-	niceOptionsArray.push({text: `Leather pants and a tube top`, updateSlave: {clothes: `leather pants and a tube top`}});
-	niceOptionsArray.push({text: `Leather pants and pasties`, updateSlave: {clothes: `leather pants and pasties`}});
-	niceOptionsArray.push({text: `Leather pants`, updateSlave: {clothes: `leather pants`}});
-	niceOptionsArray.push({text: `Lederhosen`, updateSlave: {clothes: `lederhosen`}});
-	niceOptionsArray.push({text: `Leotard`, updateSlave: {clothes: `a leotard`}});
-	niceOptionsArray.push({text: `Maid (nice)`, updateSlave: {clothes: `a nice maid outfit`}});
-	niceOptionsArray.push({text: `Maid (slutty)`, updateSlave: {clothes: `a slutty maid outfit`}});
-	niceOptionsArray.push({text: `Military uniform`, updateSlave: {clothes: `a military uniform`}});
-	niceOptionsArray.push({text: `Mini dress`, updateSlave: {clothes: `a mini dress`}});
-	niceOptionsArray.push({text: `Monokini`, updateSlave: {clothes: `a monokini`}});
-	niceOptionsArray.push({text: `Mounty outfit`, updateSlave: {clothes: `a mounty outfit`}});
-	niceOptionsArray.push({text: `Nice lingerie`, updateSlave: {clothes: `attractive lingerie`}});
-	niceOptionsArray.push({text: `Niqab and abaya`, updateSlave: {clothes: `a niqab and abaya`}});
-	niceOptionsArray.push({text: `Nurse (nice)`, updateSlave: {clothes: `a nice nurse outfit`}});
-	niceOptionsArray.push({text: `Nurse (slutty)`, updateSlave: {clothes: `a slutty nurse outfit`}});
-	niceOptionsArray.push({text: `One-piece swimsuit`, updateSlave: {clothes: `a one-piece swimsuit`}});
-	niceOptionsArray.push({text: `Overalls`, updateSlave: {clothes: `overalls`}});
-	niceOptionsArray.push({text: `Oversized t-shirt and boyshorts`, updateSlave: {clothes: `an oversized t-shirt and boyshorts`}});
-	niceOptionsArray.push({text: `Oversized t-shirt`, updateSlave: {clothes: `an oversized t-shirt`}});
-	niceOptionsArray.push({text: `Panties and pasties`, updateSlave: {clothes: `panties and pasties`}});
-	niceOptionsArray.push({text: `Panties`, updateSlave: {clothes: `panties`}});
-	niceOptionsArray.push({text: `Pasties`, updateSlave: {clothes: `pasties`}});
-	niceOptionsArray.push({text: `Police uniform`, updateSlave: {clothes: `a police uniform`}});
-	niceOptionsArray.push({text: `Pony outfit (nice)`, updateSlave: {clothes: `a nice pony outfit`}});
-	niceOptionsArray.push({text: `Pony outfit (slutty)`, updateSlave: {clothes: `a slutty pony outfit`}});
-	niceOptionsArray.push({text: `Red Army uniform`, updateSlave: {clothes: `a red army uniform`}});
-	niceOptionsArray.push({text: `Santa dress`, updateSlave: {clothes: `a Santa dress`}});
-	niceOptionsArray.push({text: `Scalemail bikini`, updateSlave: {clothes: `a scalemail bikini`}});
-	niceOptionsArray.push({text: `Schoolgirl`, updateSlave: {clothes: `a schoolgirl outfit`}});
-	niceOptionsArray.push({text: `Schutzstaffel uniform (nice)`, updateSlave: {clothes: `a schutzstaffel uniform`}});
-	niceOptionsArray.push({text: `Schutzstaffel uniform (slutty)`, updateSlave: {clothes: `a slutty schutzstaffel uniform`}});
-	niceOptionsArray.push({text: `Skimpy loincloth`, updateSlave: {clothes: `a skimpy loincloth`}});
-	niceOptionsArray.push({text: `Slave gown`, updateSlave: {clothes: `a slave gown`}});
-	niceOptionsArray.push({text: `Slutty outfit`, updateSlave: {clothes: `a slutty outfit`}});
-	niceOptionsArray.push({text: `Spats and a tank top`, updateSlave: {clothes: `spats and a tank top`}});
-	niceOptionsArray.push({text: `Sport shorts and a sports bra`, updateSlave: {clothes: `sport shorts and a sports bra`}});
-	niceOptionsArray.push({text: `Sport shorts and a t-shirt`, updateSlave: {clothes: `sport shorts and a t-shirt`}});
-	niceOptionsArray.push({text: `Sport shorts`, updateSlave: {clothes: `sport shorts`}});
-	niceOptionsArray.push({text: `Sports bra`, updateSlave: {clothes: `a sports bra`}});
-	niceOptionsArray.push({text: `String bikini`, updateSlave: {clothes: `a string bikini`}});
-	niceOptionsArray.push({text: `Striped bra`, updateSlave: {clothes: `a striped bra`}});
-	niceOptionsArray.push({text: `Striped panties`, updateSlave: {clothes: `striped panties`}});
-	niceOptionsArray.push({text: `Striped underwear`, updateSlave: {clothes: `striped underwear`}});
-	niceOptionsArray.push({text: `Succubus costume`, updateSlave: {clothes: `a succubus outfit`}});
-	niceOptionsArray.push({text: `Suit (nice)`, updateSlave: {clothes: `nice business attire`}});
-	niceOptionsArray.push({text: `Suit (slutty)`, updateSlave: {clothes: `slutty business attire`}});
-	niceOptionsArray.push({text: `Sweater and cutoffs`, updateSlave: {clothes: `a sweater and cutoffs`}});
-	niceOptionsArray.push({text: `Sweater and panties`, updateSlave: {clothes: `a sweater and panties`}});
-	niceOptionsArray.push({text: `Sweater`, updateSlave: {clothes: `a sweater`}});
-	niceOptionsArray.push({text: `T-shirt and jeans`, updateSlave: {clothes: `a t-shirt and jeans`}});
-	niceOptionsArray.push({text: `T-shirt and panties`, updateSlave: {clothes: `a t-shirt and panties`}});
-	niceOptionsArray.push({text: `T-shirt and thong`, updateSlave: {clothes: `a t-shirt and thong`}});
-	niceOptionsArray.push({text: `T-shirt`, updateSlave: {clothes: `a t-shirt`}});
-	niceOptionsArray.push({text: `Tank-top and panties`, updateSlave: {clothes: `a tank-top and panties`}});
-	niceOptionsArray.push({text: `Tank-top`, updateSlave: {clothes: `a tank-top`}});
-	niceOptionsArray.push({text: `Thong`, updateSlave: {clothes: `a thong`}});
-	niceOptionsArray.push({text: `Tube top and thong`, updateSlave: {clothes: `a tube top and thong`}});
-	niceOptionsArray.push({text: `Tube top`, updateSlave: {clothes: `a tube top`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Attractive lingerie for a pregnant woman`, updateSlave: {clothes: `attractive lingerie for a pregnant woman`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Bimbo outfit`, updateSlave: {clothes: `a bimbo outfit`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Bunny outfit`, updateSlave: {clothes: `a bunny outfit`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Body oil`, updateSlave: {clothes: `body oil`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Chattel habit`, updateSlave: {clothes: `a chattel habit`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Conservative clothing`, updateSlave: {clothes: `conservative clothing`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Courtesan dress`, updateSlave: {clothes: `a courtesan dress`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Harem gauze`, updateSlave: {clothes: `harem gauze`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Huipil`, updateSlave: {clothes: `a huipil`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Kimono`, updateSlave: {clothes: `a kimono`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Maternity dress`, updateSlave: {clothes: `a maternity dress`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Qipao (nice)`, updateSlave: {clothes: `a long qipao`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Qipao (slutty)`, updateSlave: {clothes: `a slutty qipao`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Stretch pants and a crop-top`, updateSlave: {clothes: `stretch pants and a crop-top`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Toga`, updateSlave: {clothes: `a toga`}});
-	niceOptionsArray.push({prefix: `FS`, text: `Western clothing`, updateSlave: {clothes: `Western clothing`}});
-
-	// Harsh options:
-	harshOptionsArray.push({text: `Go naked`, updateSlave: {clothes: `no clothing`}});
-	harshOptionsArray.push({prefix: `FS`, text: `Chains`, updateSlave: {clothes: `chains`}});
-	harshOptionsArray.push({text: `Penitent nun`, updateSlave: {clothes: `a penitent nuns habit`}});
-	harshOptionsArray.push({text: `Restrictive latex`, updateSlave: {clothes: `restrictive latex`}});
-	harshOptionsArray.push({text: `Shibari ropes`, updateSlave: {clothes: `shibari ropes`}});
-	harshOptionsArray.push({text: `Uncomfortable straps`, updateSlave: {clothes: `uncomfortable straps`}});
+	let clothingOption;
+	setup.clothes.forEach(item => {
+		clothingOption = {
+			text: item.name,
+			updateSlave: {clothingOption: item.value}
+		};
+		if (item.fs) {
+			clothingOption.prefix = `FS`;
+		}
+		if (item.comfort === "nice") {
+			niceOptionsArray.push(clothingOption);
+		} else if (item.comfort === "harsh") {
+			harshOptionsArray.push(clothingOption);
+		}
+	});
 
 	// Sort
 	niceOptionsArray = niceOptionsArray.sort((a, b) => (a.text > b.text) ? 1 : -1);